summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Watson <twatson52@icloud.com>2022-05-22 20:03:15 -0500
committerThomas Watson <twatson52@icloud.com>2022-06-03 13:21:03 -0500
commitde887d4f2c668c723930f69b70f09e91e1223df4 (patch)
treeafef3924defc4f04acc73468731e411b186c6b23
parent742dc5ea13c3b90a8baa1ce886f4f85eadccb764 (diff)
downloadnixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar.gz
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar.bz2
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar.lz
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar.xz
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.tar.zst
nixpkgs-de887d4f2c668c723930f69b70f09e91e1223df4.zip
usbmuxd: unstable-2021-05-08 -> 1.1.1+date=2022-04-04, cleanup
-rw-r--r--pkgs/tools/misc/usbmuxd/default.nix36
1 files changed, 25 insertions, 11 deletions
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index 96b82a8a20a..624c818c1f7 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -1,23 +1,37 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, libimobiledevice
+, libusb1
+}:
 
 stdenv.mkDerivation rec {
   pname = "usbmuxd";
-  version = "unstable-2021-05-08";
+  version = "1.1.1+date=2022-04-04";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = "5e484e18f1383b5a0bd6c353ab1d668b03e4ffab";
-    sha256 = "sha256-hhbfRmLEhVVuJNnw65PakPnvjSCrN3oSMK6D7Zwnw60=";
+    rev = "2839789bdb581ede7c331b9b4e07e0d5a89d7d18";
+    hash = "sha256-wYW6hI0Ti9gKtk/wxIbdY5KaPMs/p+Ve9ceeRqXihQI=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  propagatedBuildInputs = [ libimobiledevice libusb1 ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
 
-  preConfigure = ''
-    configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d"
-    configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system"
-  '';
+  propagatedBuildInputs = [
+    libimobiledevice
+    libusb1
+  ];
+
+  configureFlags = [
+    "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/libimobiledevice/usbmuxd";
@@ -32,7 +46,7 @@ stdenv.mkDerivation rec {
       in parallel. The higher-level layers are handled by libimobiledevice.
     '';
     license = licenses.gpl2Plus;
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ infinisil ];
   };
 }