luminanceHDR: 2.4.0 -> 2.5.1

NixOS · Jan 12, 2018 · cad14c7 · cad14c7
1 parent 08ab28b
commit cad14c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,28 +1,21 @@
-{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, boost, exiv2, fftwFloat, gsl
+{ stdenv, cmake, fetchurl, pkgconfig, boost, exiv2, fftwFloat, gsl
 , ilmbase, lcms2, libraw, libtiff, openexr
-, qtbase, qtdeclarative, qttools, qtwebkit
+, qtbase, qtdeclarative, qttools, qtwebengine
 }:
 
 stdenv.mkDerivation rec {
-  name = "luminance-hdr-2.4.0";
+  name = "luminance-hdr-2.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2";
-    sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l";
+    sha256 = "15hnyk9yjkkc97dmnrg2ipfgwqxprlcyv2kyvbls4d54zc56x658";
   };
 
-  patches = [(fetchpatch {
-    name = "fix-qt53-build.diff";
-    url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/"
-      + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc";
-    sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl";
-  })];
-
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   buildInputs =
     [
-      qtbase qtdeclarative qttools qtwebkit
+      qtbase qtdeclarative qttools qtwebengine
       boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr
     ];
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15880,7 +15880,7 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
-  luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };