diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-29 22:34:54 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-29 22:35:32 +0100 |
commit | 1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484 (patch) | |
tree | 0d840f8526f9ef41ee8c21414661a68d57299b9b | |
parent | 5997b4f3db89b738c498bb7786f2e95b3b9b5dcd (diff) | |
download | nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.gz nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.bz2 nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.lz nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.xz nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.zst nixpkgs-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.zip |
Fix some instances of #33166 correctly
-rw-r--r-- | pkgs/os-specific/linux/bbswitch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wireguard/default.nix | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index eacddc715ef..ade9b8f750f 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -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" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 74936a02ce7..3b1b6f9863f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -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 ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 509f8a94818..70811347be5 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -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"; }; |