From d18f55269c3a0d83c0c34875b6047adb12e4b581 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Sun, 19 Mar 2017 05:27:17 +0300 Subject: [PATCH 1/2] nvidia-x11: don't patch things if libsOnly requested --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eb4d3ae224a08a..4573766b78bacd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -43,7 +43,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.system}"; # 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 else [ (fetchurl { url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; From d860a68fd0f203983a734094ef6eb78707c586c2 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Sun, 19 Mar 2017 05:28:02 +0300 Subject: [PATCH 2/2] nvidia-x11: $bin can be empty --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 24a2e2cf06ffb4..99813d38236b77 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -78,7 +78,7 @@ installPhase() { fi # 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 # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much.