forked from mirrors/nixpkgs
Fix some instances of #33166 correctly
This commit is contained in:
parent
5997b4f3db
commit
1fb0d3d158
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, kernel, libelf }:
|
||||
{ stdenv, fetchurl, fetchpatch, kernel }:
|
||||
|
||||
let
|
||||
baseName = "bbswitch";
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
|
||||
}) ];
|
||||
|
||||
buildInputs = [ libelf ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
|
||||
{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
|
||||
, kernel ? null, libelf, xorg, zlib, perl, nukeReferences
|
||||
, kernel ? null, xorg, zlib, perl, nukeReferences
|
||||
, # Whether to build the libraries only (i.e. not the kernel module or
|
||||
# nvidia-settings). Used to support 32-bit binaries on 64-bit
|
||||
# Linux.
|
||||
|
@ -62,9 +62,7 @@ let
|
|||
|
||||
libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
|
||||
|
||||
nativeBuildInputs = [ perl nukeReferences ];
|
||||
|
||||
buildInputs = [ libelf ];
|
||||
nativeBuildInputs = [ perl nukeReferences ] ++ kernel.moduleBuildDependencies;
|
||||
|
||||
disallowedReferences = optional (!libsOnly) [ kernel.dev ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libmnl, libelf, kernel ? null }:
|
||||
{ stdenv, fetchurl, libmnl, kernel ? null }:
|
||||
|
||||
# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
|
||||
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
|
||||
|
@ -37,7 +37,7 @@ let
|
|||
|
||||
NIX_CFLAGS = ["-Wno-error=cpp"];
|
||||
|
||||
buildInputs = [ libelf ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
buildPhase = "make module";
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue