diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-17 11:14:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-17 11:14:26 +0200 |
| commit | 329a70500595e17729931781f411ec8a9964ee3d (patch) | |
| tree | 77ba40788a1bf918fa93cdaf4e60e8548b89868e | |
| parent | 9f347eba61b2fca5ae5ece21fa74af5d3024bfb3 (diff) | |
| download | nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar.gz nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar.bz2 nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar.lz nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar.xz nixlib-329a70500595e17729931781f411ec8a9964ee3d.tar.zst nixlib-329a70500595e17729931781f411ec8a9964ee3d.zip | |
nvidia-x11: Fix the library-only build
Also, introduce a function ‘versionAtLeast’ which is probably more natural than ‘versionOlder’.
| -rw-r--r-- | pkgs/lib/strings.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index ed668e2b9270..024a9ac7d7a2 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -163,6 +163,10 @@ rec { 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 # ‘name’ attribute. getVersion = drv: (builtins.parseDrvName drv.name).version; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e4e9a2c02057..9e750629b829 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] - ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch; + ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch; src = if stdenv.system == "i686-linux" then |