diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
| commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
| tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/applications/graphics | |
| parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
| download | nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.zip | |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ea638de7925d..702911fee744 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -245,7 +245,7 @@ rec { /* =============== simple script files ==================== */ - # also have a look at enblendenfuse in all-packages.nix + # also have a look at enblend-enfuse in all-packages.nix exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 88912cbda55d..b11ed1a99df7 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, pkgconfig , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff , openexr, panotools, perlPackages }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake perlPackages.ImageExifTool ]; |