public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some instances of #33166 correctly

Browse Source
This commit is contained in:
Franz Pletz 2017-12-29 22:34:54 +01:00
parent 5997b4f3db
commit 1fb0d3d158
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/bbswitch/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, kernel, libelf }: { stdenv, fetchurl, fetchpatch, kernel }:
let let
baseName = "bbswitch"; baseName = "bbswitch";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m";
}) ]; }) ];
buildInputs = [ libelf ]; nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];

6
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -12,7 +12,7 @@
}: }:
{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch { 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 , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux. # Linux.
@ -62,9 +62,7 @@ let
libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ]; libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
nativeBuildInputs = [ perl nukeReferences ]; nativeBuildInputs = [ perl nukeReferences ] ++ kernel.moduleBuildDependencies;
buildInputs = [ libelf ];
disallowedReferences = optional (!libsOnly) [ kernel.dev ]; disallowedReferences = optional (!libsOnly) [ kernel.dev ];

4
pkgs/os-specific/linux/wireguard/default.nix
View File

@ -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 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
@ -37,7 +37,7 @@ let
NIX_CFLAGS = ["-Wno-error=cpp"]; NIX_CFLAGS = ["-Wno-error=cpp"];
buildInputs = [ libelf ]; nativeBuildInputs = kernel.moduleBuildDependencies;
buildPhase = "make module"; buildPhase = "make module";
}; };