diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 12:41:13 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 12:43:00 +0100 |
| commit | 0d72174dbd7b3d8f01f7c369059854eee9d1346f (patch) | |
| tree | cfb37fdbe02c3973f44d2b2428b0b8c4759d85d6 /pkgs/development/libraries/gdk-pixbuf | |
| parent | 0cddd5787f834fab1dda943cf47d2f129c4d8499 (diff) | |
| parent | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff) | |
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/gdk-pixbuf')
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 56ef0f708748b..532318b334b83 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; |