From 742dc5ea13c3b90a8baa1ce886f4f85eadccb764 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sun, 22 May 2022 19:58:25 -0500
Subject: [PATCH] libplist: 2.2.0 -> 2.2.0+date=2022-04-05, cleanup, use Python
 3

---
 .../libraries/libplist/default.nix            | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index cac4299f2890..23b1fabce78b 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,34 +1,46 @@
-{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+
+, enablePython ? false
+, python3
+}:
 
 stdenv.mkDerivation rec {
   pname = "libplist";
-  version = "2.2.0";
+  version = "2.2.0+date=2022-04-05";
+
+  outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = version;
-    sha256 = "1vxhpjxniybqsg5wcygmdmr5dv7p2zb34dqnd3bi813rnnzsdjm6";
+    rev = "db93bae96d64140230ad050061632531644c46ad";
+    hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo=";
   };
 
-  outputs = ["bin" "dev" "out" ] ++ lib.optional enablePython "py";
+  postPatch = ''
+    echo '${version}' > .tarball-version
+  '';
 
   nativeBuildInputs = [
-    pkg-config
     autoreconfHook
-  ] ++ lib.optionals enablePython [
-    python
-    python.pkgs.cython
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals enablePython [
+    python3
+    python3.pkgs.cython
   ];
 
   configureFlags = lib.optionals (!enablePython) [
     "--without-cython"
   ];
 
-  propagatedBuildInputs = [ glib ];
-
   postFixup = lib.optionalString enablePython ''
-    moveToOutput "lib/${python.libPrefix}" "$py"
+    moveToOutput "lib/${python3.libPrefix}" "$py"
   '';
 
   meta = with lib; {
@@ -36,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/libimobiledevice/libplist";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ infinisil ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }