From 1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 29 Dec 2017 22:34:54 +0100 Subject: Fix some instances of #33166 correctly --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux/nvidia-x11') 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 ]; -- cgit 1.4.1