From f43d8aed31cefa4049bd8c49f5e6c7a561597c5d Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 21:39:55 +0100 Subject: [PATCH] tk-{8_5,8_6,9_0}: remove code for macOS < 11 --- pkgs/development/libraries/tk/generic.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index dfe14f22ec45..9374a045c054 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] -, enableAqua ? stdenv.hostPlatform.isDarwin, darwin +, enableAqua ? stdenv.hostPlatform.isDarwin , ... }: tcl.mkTclDerivation { @@ -21,10 +21,6 @@ tcl.mkTclDerivation { for file in $(find library/demos/. -type f ! -name "*.*"); do substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' - substituteInPlace unix/configure* \ - --replace-fail " -weak_framework UniformTypeIdentifiers" "" ''; postInstall = '' @@ -62,11 +58,7 @@ tcl.mkTclDerivation { propagatedBuildInputs = [ libXft - ] ++ lib.optionals enableAqua ([ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") [ - darwin.apple_sdk.frameworks.UniformTypeIdentifiers - ]); + ]; enableParallelBuilding = true;