diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/tools/graphics | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
download | nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.zip |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index f1f5ac878ba..cf0fd55ad15 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchurl -, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra -, help2man, pkgconfig, perl }: +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra +, help2man, pkgconfig, perl, tetex }: -let version = "4.1.5"; in stdenv.mkDerivation rec { name = "enblend-enfuse-${version}"; + version = "4.2"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "08dz73jgrwfhz0kh57kz048qy1c6a35ckqn9xs5rajm449vnw0pg"; + sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; - nativeBuildInputs = [ help2man perl pkgconfig ]; + nativeBuildInputs = [ help2man perl pkgconfig tetex ]; + + preConfigure = '' + patchShebangs src/embrace + ''; enableParallelBuilding = true; - meta = { - inherit version; + meta = with stdenv.lib; { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ nckx ]; }; } |