diff options
| author | Artturi <Artturin@artturin.com> | 2023-08-05 17:56:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 17:56:50 +0300 |
| commit | 49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9 (patch) | |
| tree | ce05403c63754d9b820cc51ec92c9c569afed968 | |
| parent | 0f629c1e693411528f2732fd5e64622adf3b9c7f (diff) | |
| parent | ab391719c222c4b60ce5671faabd1bd9da436e6e (diff) | |
| download | nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar.gz nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar.bz2 nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar.lz nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar.xz nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.tar.zst nixlib-49ee0ac5b02b4c006cb9f3ae80d6d06d653bd7e9.zip | |
Merge pull request #233597 from viraptor/filezilla-darwin
libfilezilla: fix darwin intel build
| -rw-r--r-- | pkgs/development/libraries/libfilezilla/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 67b49b55c7d7..3eb9fad6336f 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b07f74822c7..fb4dc6500bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22444,8 +22444,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 { }; |