Unverified Commit 49ee0ac5 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #233597 from viraptor/filezilla-darwin 

libfilezilla: fix darwin intel build
parents 0f629c1e ab391719

pkgs/development/libraries/libfilezilla/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -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; {

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 { };