From d56d8c4669748cb4d50a94a5b60066b09458aa92 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 22 May 2022 20:12:47 -0500 Subject: [PATCH] libimobiledevice: unstable-2021-06-02 -> 1.3.0+date=2022-05-22, cleanup --- .../libraries/libimobiledevice/default.nix | 37 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 94fce176127..8ded220678d 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -2,45 +2,52 @@ , stdenv , fetchFromGitHub , autoreconfHook -, libtool , pkg-config , gnutls , libgcrypt -, libtasn1 -, glib , libplist +, libtasn1 , libusbmuxd +, libimobiledevice-glue +, SystemConfiguration +, CoreFoundation }: stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "unstable-2021-06-02"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "ca324155f8b33babf907704828c7903608db0aa2"; - sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I="; - }; + version = "1.3.0+date=2022-05-22"; outputs = [ "out" "dev" ]; + src = fetchFromGitHub { + owner = "libimobiledevice"; + repo = pname; + rev = "12394bc7be588be83c352d7441102072a89dd193"; + hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM="; + }; + + postPatch = '' + echo '${version}' > .tarball-version + ''; + nativeBuildInputs = [ autoreconfHook - libtool pkg-config ]; propagatedBuildInputs = [ - glib gnutls libgcrypt libplist libtasn1 libusbmuxd + libimobiledevice-glue + ] ++ lib.optionals stdenv.isDarwin [ + SystemConfiguration + CoreFoundation ]; - configureFlags = [ "--disable-openssl" "--without-cython" ]; + configureFlags = [ "--with-gnutls" "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { devices to the Linux Desktop. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce261ca881..6a7712ffcd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18678,7 +18678,9 @@ with pkgs; libieee1284 = callPackage ../development/libraries/libieee1284 { }; - libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; + libimobiledevice = callPackage ../development/libraries/libimobiledevice { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation; + }; libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { };