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 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 5997b4f3db89b738c498bb7786f2e95b3b9b5dcd (diff) | |
| download | nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.gz nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.bz2 nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.lz nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.xz nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.tar.zst nixlib-1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484.zip | |
Fix some instances of #33166 correctly
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 74936a02ce7d..3b1b6f9863f8 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 ]; |