summary refs log tree commit diff
path: root/pkgs/development/libraries/libplist/default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 23:08:30 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-06 23:08:30 +0000
commit3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f (patch)
tree201cfcc1d18cbbb75bb90d244c7073b9a5899503 /pkgs/development/libraries/libplist/default.nix
parent26ea77ad65d009fa6715934860ec769ee10a56b1 (diff)
parent1401241864c48ebab0f3b8c2df446e0c3ba4a720 (diff)
downloadnixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.gz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.bz2
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.lz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.xz
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.zst
nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.zip
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31386
Diffstat (limited to 'pkgs/development/libraries/libplist/default.nix')
-rw-r--r--pkgs/development/libraries/libplist/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 4c4abe0557f3..816269599387 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, cmake, libxml2, glib, swig, python }:
+{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
 
 stdenv.mkDerivation rec {
   name = "libplist-1.3";
 
-  buildInputs = [ cmake swig ];
+  buildNativeInputs = [ cmake swig2 ];
 
   patches = [ ./swig.patch ];
 
   propagatedBuildInputs = [ libxml2 glib python ];
 
+  passthru.swig = swig2;
+
   src = fetchurl {
     url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
     sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";