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

nvidia-x11: Fix the library-only build 

Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
This commit is contained in:
Eelco Dolstra 2013-07-17 11:14:26 +02:00
parent 9f347eba61
commit 329a705005
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/strings.nix
View File

@ -163,6 +163,10 @@ rec {
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
# Return true iff string v1 denotes a version equal to or newer than v2.
versionAtLeast = v1: v2: !versionOlder v1 v2;
# Get the version of the specified derivation, as specified in its # Get the version of the specified derivation, as specified in its
# ‘name’ attribute. # ‘name’ attribute.
getVersion = drv: (builtins.parseDrvName drv.name).version; getVersion = drv: (builtins.parseDrvName drv.name).version;

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

@ -25,7 +25,7 @@ stdenv.mkDerivation {
patches = patches =
[ ./version-test.patch ] [ ./version-test.patch ]
++ optional (!versionOlder kernelDev.version "3.10") kernel310patch; ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch;
src = src =
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then