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

libplist: use python2, multiple outputs, fix bindings

This commit is contained in:
Frederik Rietdijk 2016-11-09 15:01:28 +01:00
parent 7ea28bfc46
commit 6449435b04
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"; name = "libplist-1.12";
nativeBuildInputs = [ pkgconfig swig2 ]; nativeBuildInputs = [ pkgconfig swig2 python cython ];
#patches = [ ./swig.patch ]; #patches = [ ./swig.patch ];
propagatedBuildInputs = [ libxml2 glib python ]; propagatedBuildInputs = [ libxml2 glib ];
passthru.swig = swig2; passthru.swig = swig2;
outputs = ["out" "dev" "bin" "py"];
postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py"
'';
src = fetchurl { src = fetchurl {
url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf"; sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf";

3
pkgs/top-level/python-packages.nix
View File

@ -13530,6 +13530,9 @@ in {
clblas = pkgs.clblas-cuda; 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 libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else
(pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py;