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

Merge pull request #44966 from worldofpeace/imobile-updates

Browse Source 
libimobiledevice updates
This commit is contained in:
Silvan Mosberger
2018-08-15 17:05:10 +02:00
committed by GitHub
parent fe6ebf85b7 319b5cec4e
commit b1cf86b8bb
6 changed files with 135 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libgpod/default.nix
+2 -2
View File
@@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl
libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++
lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
meta = {
homepage = http://gtkpod.sourceforge.net/;
pkgs/development/libraries/libimobiledevice/default.nix
+42 -25
View File
@@ -1,32 +1,46 @@
{ stdenv, fetchurl, fetchpatch, python2, pkgconfig, usbmuxd, glib, libgcrypt,
libtasn1, libplist, readline, libusbmuxd, openssl }:
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, gnutls
, libgcrypt, libtasn1, glib, libplist, libusbmuxd }:
stdenv.mkDerivation rec {
name = "libimobiledevice-1.2.0";
pname = "libimobiledevice";
version = "2018-07-24";
nativeBuildInputs = [ python2 libplist.swig pkgconfig ];
buildInputs = [ readline ];
propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
name = "${pname}-${version}";
patches = [
./disable_sslv3.patch
(fetchpatch {
name = "CVE-2016-5104.patch";
url = "https://github.com/libimobiledevice/libimobiledevice/commit/df1f5c4d70d0c19ad40072f5246ca457e7f9849e.patch";
sha256 = "06ygb9aqcvm4v08wrldsddjgyqv5bkpq6lxzq2a1nwqp9mq4a4k1";
})
];
postPatch = ''sed -e 's@1\.3\.21@@' -i configure'';
passthru.swig = libplist.swig;
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.bz2";
sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "d7a2e04d2e7880c56116fd35489a7f98755501b7";
sha256 = "0cj0j10lmfr28c7nh79n2mcmy31xx50g93h0bqs0l7y76ph4dqkc";
};
meta = {
homepage = http://www.libimobiledevice.org;
outputs = [ "out" "dev" ];
nativeBuildInputs = [
autoconf
automake
libtool
pkgconfig
];
propagatedBuildInputs = [
glib
gnutls
libgcrypt
libplist
libtasn1
libusbmuxd
];
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [
"--disable-static"
"--disable-openssl"
"--without-cython"
];
meta = with stdenv.lib; {
homepage = https://github.com/libimobiledevice/libimobiledevice;
description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux";
longDescription = ''
libimobiledevice is a software library that talks the protocols to support
@@ -38,7 +52,10 @@ stdenv.mkDerivation rec {
installed applications, retrieve addressbook/calendars/notes and bookmarks
and synchronize music and video to the device. The library is in
development since August 2007 with the goal to bring support for these
devices to the Linux Desktop.'';
inherit (usbmuxd.meta) platforms maintainers;
devices to the Linux Desktop.
'';
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
};
}
pkgs/development/libraries/libplist/default.nix
+26 -16
View File
@@ -1,31 +1,41 @@
{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }:
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig, python2Packages, glib }:
let
inherit (python2Packages) python cython;
in stdenv.mkDerivation rec {
name = "libplist-${version}";
version = "2.0.0";
in
stdenv.mkDerivation rec {
pname = "libplist";
version = "2018-07-25";
nativeBuildInputs = [ pkgconfig swig2 python cython ];
name = "${pname}-${version}";
propagatedBuildInputs = [ glib ];
passthru.swig = swig2;
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "db68a9d1070b363eee93147f072f46526064acbc";
sha256 = "0lxyb35jjg31m8dxhsv1jr2ccy5s19fsqzisy7lfjk46w7brs4h5";
};
outputs = ["bin" "dev" "out" "py"];
nativeBuildInputs = [
pkgconfig
python
cython
autoreconfHook
];
propagatedBuildInputs = [ glib ];
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"
'';
src = fetchurl {
url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2";
sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis";
};
meta = {
homepage = https://github.com/JonathanBeck/libplist;
platforms = stdenv.lib.platforms.all;
meta = with stdenv.lib; {
description = "A library to handle Apple Property List format in binary or XML";
homepage = https://github.com/libimobiledevice/libplist;
license = licenses.lgpl21Plus;
maintainers = [ ];
platforms = platforms.linux;
};
}
pkgs/development/libraries/libusbmuxd/default.nix
+18 -17
View File
@@ -1,25 +1,26 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libplist }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libplist }:
stdenv.mkDerivation rec {
name = "libusbmuxd-1.0.10";
src = fetchurl {
url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2";
sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs";
pname = "libusbmuxd";
version = "2018-07-23";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "78df9be5fc8222ed53846cb553de9b5d24c85c6c";
sha256 = "05hbn0mbmv5ln9hfsvnf7i1mnp6ncbyfnl5w331kg4fi12wjshc5";
};
patches = [
(fetchpatch {
name = "CVE-2016-5104.patch";
url = "https://github.com/libimobiledevice/libusbmuxd/commit/4397b3376dc4e4cb1c991d0aed61ce6482614196.patch";
sha256 = "0cl3vys7bkwbdzf64d0rz3zlqpfc30w4l7j49ljv01agh42ywhgk";
})
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libplist ];
meta = {
homepage = http://www.libimobiledevice.org;
platforms = stdenv.lib.platforms.unix;
meta = with stdenv.lib; {
description = "A client library to multiplex connections from and to iOS devices";
homepage = https://github.com/libimobiledevice/libusbmuxd;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
};
}