From 0d2112dae7380f881f23e9ad12ca563918f4a830 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Jul 2020 15:36:18 +0000 Subject: [PATCH 1/2] libfilezilla: 0.22.0 -> 0.23.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 3bd54951994..f6211a6b11e 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0ylgxw1lxdqvayy5285mlfrkr9cvsgasy2zci6g6mv9rng261xn5"; + sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd"; }; nativeBuildInputs = [ pkgconfig ]; From 6a9ad6956a311cc98b86c63f95e2e5e3748618ce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 19 Jul 2020 04:20:00 -0500 Subject: [PATCH 2/2] libfilezilla: enable on darwin --- pkgs/development/libraries/libfilezilla/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index f6211a6b11e..ed9de3aaa4c 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -5,6 +5,8 @@ , gnutls , nettle , pkgconfig +, libiconv +, ApplicationServices }: stdenv.mkDerivation rec { @@ -18,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext gnutls nettle ]; + buildInputs = [ gettext gnutls nettle ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; enableParallelBuilding = true; @@ -27,6 +30,6 @@ stdenv.mkDerivation rec { description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f007ffaba9..dc9b2909223 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13006,7 +13006,9 @@ in libfido2 = callPackage ../development/libraries/libfido2 { }; - libfilezilla = callPackage ../development/libraries/libfilezilla { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; libfishsound = callPackage ../development/libraries/libfishsound { };