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-10 21:32:49 -0400 |
| commit | 5962d0d5f3cc2994204cff26d7e189d9d91eef14 (patch) | |
| tree | c4a72c6f2a1be93754506da0f59c8f52ededa6d9 /pkgs/development/tools | |
| parent | 41cdec2e513dbf78ab0fae5a493f0f8b1354ca5e (diff) | |
| download | nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar.gz nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar.bz2 nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar.lz nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar.xz nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.tar.zst nixpkgs-5962d0d5f3cc2994204cff26d7e189d9d91eef14.zip | |
cmake: Only apply application-services.patch with 3.11
The patch doesn't apply with earlier versions. Fixes #41816.
Diffstat (limited to 'pkgs/development/tools')
| -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 051b8107703..438aa81a9d0 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" ]; |