public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105722 from rb2k/idevicerestore_darwin

Browse Source 
idevicerestore: Add darwin build support.
This commit is contained in:
Silvan Mosberger 2020-12-02 22:54:44 +01:00 committed by GitHub
commit 96f34a8f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libimobiledevice/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
devices to the Linux Desktop. devices to the Linux Desktop.
''; '';
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ infinisil ]; maintainers = with maintainers; [ infinisil ];
}; };
} }

2
pkgs/development/libraries/libirecovery/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.lgpl21; license = licenses.lgpl21;
# Upstream description says it works on more platforms, but packager hasn't tried that yet # Upstream description says it works on more platforms, but packager hasn't tried that yet
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ nh2 ]; maintainers = with maintainers; [ nh2 ];
}; };
} }

2
pkgs/development/libraries/libplist/default.nix
View File

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/libimobiledevice/libplist"; homepage = "https://github.com/libimobiledevice/libplist";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ infinisil ]; maintainers = with maintainers; [ infinisil ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

2
pkgs/development/libraries/libusbmuxd/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "A client library to multiplex connections from and to iOS devices"; description = "A client library to multiplex connections from and to iOS devices";
homepage = "https://github.com/libimobiledevice/libusbmuxd"; homepage = "https://github.com/libimobiledevice/libusbmuxd";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ infinisil ]; maintainers = with maintainers; [ infinisil ];
}; };
} }

7
pkgs/tools/misc/idevicerestore/default.nix
View File

@ -4,6 +4,7 @@
, libirecovery , libirecovery
, libzip , libzip
, libusbmuxd , libusbmuxd
, IOKit
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
# Not listing other dependencies specified in # Not listing other dependencies specified in
# https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20
# because they are inherited `libimobiledevice`. # because they are inherited `libimobiledevice`.
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/libimobiledevice/idevicerestore"; homepage = "https://github.com/libimobiledevice/idevicerestore";
@ -51,8 +52,8 @@ stdenv.mkDerivation rec {
This will download and restore a device to the latest firmware available. This will download and restore a device to the latest firmware available.
''; '';
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
# configure.ac suggests it should work for darwin and mingw as well but not tried yet # configure.ac suggests it should work for mingw as well but not tried yet
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ nh2 ]; maintainers = with maintainers; [ nh2 ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -4752,7 +4752,9 @@ in
ifuse = callPackage ../tools/filesystems/ifuse { }; ifuse = callPackage ../tools/filesystems/ifuse { };
ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
idevicerestore = callPackage ../tools/misc/idevicerestore { }; idevicerestore = callPackage ../tools/misc/idevicerestore {
inherit (darwin) IOKit;
};
inherit (callPackages ../tools/filesystems/irods rec { inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages.libcxxStdenv; stdenv = llvmPackages.libcxxStdenv;