From f9f0307f7a82902b457b665dbdc80c9bcda96303 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Jun 2018 21:30:23 -0400 Subject: [PATCH] cmake: Only apply application-services.patch with 3.11 The patch doesn't apply with earlier versions. Fixes #41816. --- pkgs/development/tools/build-managers/cmake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" ];