diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-06-10 21:30:23 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-06-12 20:15:51 -0400 |
| commit | f9f0307f7a82902b457b665dbdc80c9bcda96303 (patch) | |
| tree | 1b1fd84d624fa85f779d80be295e6cd4c8d9b5ec /pkgs | |
| parent | 7eb169a2574ecccd8647ce6048da6d74aded1edf (diff) | |
| download | nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar.gz nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar.bz2 nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar.lz nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar.xz nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.tar.zst nixlib-f9f0307f7a82902b457b665dbdc80c9bcda96303.zip | |
cmake: Only apply application-services.patch with 3.11
The patch doesn't apply with earlier versions. Fixes #41816.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 051b8107703d..438aa81a9d0a 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # Don't search in non-Nix locations such as /usr, but do search in our libc. patches = [ ./search-path-3.9.patch ] # Don't depend on frameworks. - ++ optional useSharedLibraries ./application-services.patch # TODO: remove conditional + ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; |