diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/idevicerestore/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 3e4739ee032ac..d874d72ec65df 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -1,23 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config , curl , libimobiledevice , libirecovery , libzip , libusbmuxd -, IOKit }: stdenv.mkDerivation rec { pname = "idevicerestore"; - version = "1.0.0"; + version = "1.0.0+date=2022-05-22"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "1w7ywp77xc6v4hifi3j9ywrj447vv7fkwg2w26w0lq95f3bkblqr"; + rev = "f80a876b3598de4eb551bafcb279947c527fae33"; + hash = "sha256-I9zZQcZFd0hfeEJM7jltJtVJ6V5C5rA/S8gINiCnJdY="; }; + postPatch = '' + echo '${version}' > .tarball-version + ''; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -32,7 +39,7 @@ stdenv.mkDerivation rec { # Not listing other dependencies specified in # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # because they are inherited `libimobiledevice`. - ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; @@ -52,8 +59,7 @@ stdenv.mkDerivation rec { This will download and restore a device to the latest firmware available. ''; license = licenses.lgpl21Plus; - # configure.ac suggests it should work for mingw as well but not tried yet - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a7712ffcd9cd..db6bfc991a4c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7048,9 +7048,7 @@ with pkgs; ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { - inherit (darwin) IOKit; - }; + idevicerestore = callPackage ../tools/misc/idevicerestore { }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; |