diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
| commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
| tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /pkgs/applications/graphics | |
| parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
| parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
| download | nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip | |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
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 702911fee744..ea638de7925d 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 enblend-enfuse in all-packages.nix + # also have a look at enblendenfuse 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 b11ed1a99df7..88912cbda55d 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, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblendenfuse, 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 enblend-enfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake perlPackages.ImageExifTool ]; |