summary refs log tree commit diff
path: root/pkgs/development/libraries/librsvg/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-02-21 12:41:13 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-02-21 12:43:00 +0100
commit0d72174dbd7b3d8f01f7c369059854eee9d1346f (patch)
treecfb37fdbe02c3973f44d2b2428b0b8c4759d85d6 /pkgs/development/libraries/librsvg/default.nix
parent0cddd5787f834fab1dda943cf47d2f129c4d8499 (diff)
parentaacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff)
downloadnixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.gz
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.bz2
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.lz
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.xz
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.zst
nixpkgs-0d72174dbd7b3d8f01f7c369059854eee9d1346f.zip
Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
Diffstat (limited to 'pkgs/development/libraries/librsvg/default.nix')
-rw-r--r--pkgs/development/libraries/librsvg/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 772bae24dab..1ac47f890ab 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ]
     ++ stdenv.lib.optional enableIntrospection [gobjectIntrospection];
   propagatedBuildInputs = [ glib gtk ];
-  buildNativeInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = ["--enable-introspection=auto"];