diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
| commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
| tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/applications/graphics/hugin | |
| parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
| download | nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.zip | |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/applications/graphics/hugin')
| -rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index b11ed1a99df..88912cbda55 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 ]; |