mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 03:10:19 +00:00
Merge pull request #247340 from NixOS/backport-233597-to-release-23.05
[Backport release-23.05] libfilezilla: fix darwin intel build
This commit is contained in:
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gettext gnutls nettle libxcrypt ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
|
||||
|
||||
preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.13 # for futimens()
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -21762,8 +21762,8 @@ with pkgs;
|
||||
udev = systemdMinimal;
|
||||
};
|
||||
|
||||
libfilezilla = callPackage ../development/libraries/libfilezilla {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
libfishsound = callPackage ../development/libraries/libfishsound { };
|
||||
|
||||
Reference in New Issue
Block a user