diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/applications/graphics/qtpfsgui | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
| download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/graphics/qtpfsgui')
| -rw-r--r-- | pkgs/applications/graphics/qtpfsgui/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index e6a0453e533a..bb307bc8e97e 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }: +{stdenv, fetchurl, qt4, qmake4Hook, exiv2, openexr, fftwSinglePrec, libtiff, ilmbase }: stdenv.mkDerivation rec { name = "qtpfsgui-1.9.3"; @@ -9,17 +9,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 exiv2 openexr fftwSinglePrec libtiff ]; + nativeBuildInputs = [ qmake4Hook ]; hardeningDisable = [ "format" ]; - configurePhase = '' + preConfigure = '' export CPATH="${ilmbase}/include/OpenEXR:$CPATH" - qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \ - OPENEXRDIR=${openexr}/include/OpenEXR \ - FFTW3DIR=${fftwSinglePrec}/include \ - LIBTIFFDIR=${libtiff}/include ''; + qmakeFlags = [ + "EXIV2PATH=${exiv2}/include/exiv2" + "OPENEXRDIR=${openexr}/include/OpenEXR" + "FFTW3DIR=${fftwSinglePrec}/include" + "LIBTIFFDIR=${libtiff}/include" + ]; + meta = { homepage = http://qtpfsgui.sourceforge.net/; description = "Qtpfsqui, a graphical application for high dynamic range (HDR) imaging"; |