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/applications/misc/calibre | |
| parent | 0cddd5787f834fab1dda943cf47d2f129c4d8499 (diff) | |
| parent | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff) | |
| download | nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.gz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.bz2 nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.lz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.xz nixlib-0d72174dbd7b3d8f01f7c369059854eee9d1346f.tar.zst nixlib-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/applications/misc/calibre')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8b04c63b39d4..23b5092cd4d8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit python; - buildNativeInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg |