diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 0b9b7bd2f54..4de5a23569e 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }: -stdenv.mkDerivation rec { +let + inherit (python2Packages) python cython; +in stdenv.mkDerivation rec { name = "libplist-1.12"; - nativeBuildInputs = [ pkgconfig swig2 ]; + nativeBuildInputs = [ pkgconfig swig2 python cython ]; #patches = [ ./swig.patch ]; - propagatedBuildInputs = [ libxml2 glib python ]; + propagatedBuildInputs = [ libxml2 glib ]; passthru.swig = swig2; + outputs = ["out" "dev" "bin" "py"]; + + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + src = fetchurl { url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c998001b587..86077665670 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13530,6 +13530,9 @@ in { clblas = pkgs.clblas-cuda; }; + libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else + (pkgs.libplist.override{python2Packages=self; }).py; + libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py;