diff options
author | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
commit | 1b979d83845945dabffebff5033cf864b41d5c64 (patch) | |
tree | 6e81ba4ab8cd28ad9fc8d9e2a3a298bc5a403042 /pkgs/os-specific/linux/nvidia-x11/default.nix | |
parent | 3f9e8601f2a8537de90f04375400538049bbdaf2 (diff) | |
parent | d93f917182dc5da7aca53fb9a847374ec0c7429a (diff) | |
download | nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar.gz nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar.bz2 nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar.lz nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar.xz nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.tar.zst nixpkgs-1b979d83845945dabffebff5033cf864b41d5c64.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8ca01b7499e..139185e7f03 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { [ gtk atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; - patches = if versionAtLeast kernel.version "4.7" then [ ./365.35-kernel-4.7.patch ] else []; + patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; buildInputs = [ perl nukeReferences ]; |