diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 2d9ab632f1c..0c829eab130 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,17 +1,21 @@ -{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa, -freeglut, bzip2, libX11, libpng, expat }: +{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt4, mesa, +freeglut, bzip2, libX11, libpng, expat, pkgconfig }: -stdenv.mkDerivation { - name = "pfstools-1.8.0"; +stdenv.mkDerivation rec { + name = "pfstools-1.8.3"; src = fetchurl { - url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz; - sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv"; + url = "mirror://sourceforge/pfstools/${name}.tar.gz"; + sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1"; }; - buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut + configureFlags = "--with-moc=${qt4}/bin/moc"; + + buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut bzip2 libX11 libpng expat ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://pfstools.sourceforge.net/; description = "Toolkit for manipulation of HDR images"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0547f5c1216..31256e5e8fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1147,9 +1147,7 @@ let ssh = openssh; }; - pfstools = callPackage ../tools/graphics/pfstools { - qt = qt3; - }; + pfstools = callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { };