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

Merge commit 'refs/pull/24045/head' of git://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-03-19 18:44:00 +03:00
commit b1871631a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -78,7 +78,7 @@ installPhase() {
fi fi
# All libs except GUI-only are installed now, so fixup them. # All libs except GUI-only are installed now, so fixup them.
for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
do do
# I'm lazy to differentiate needed libs per-library, as the closure is the same. # I'm lazy to differentiate needed libs per-library, as the closure is the same.
# Unfortunately --shrink-rpath would strip too much. # Unfortunately --shrink-rpath would strip too much.

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

@ -43,7 +43,7 @@ let
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";
# patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
patches = if versionOlder version "375" patches = if libsOnly || versionOlder version "375"
then null then null
else [ (fetchurl { else [ (fetchurl {
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";