diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2020-10-26 08:39:23 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-26 08:39:23 -0300 |
commit | ad19f562304104365166de1085943d884f67432e (patch) | |
tree | 8d15750c40f1b46999da27d8630e08d936036a3e | |
parent | 81573a64358c121366c8da519a0abd81a1489ca6 (diff) | |
parent | eee815842a4a27f60446bab6a73db13b7cc9832a (diff) |
Merge pull request #90276 from Ralith/pfsfix
pfstools: fix Qt environment
-rw-r--r-- | pkgs/tools/graphics/pfstools/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 1c437a3f05cd..f570251374cf 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv2, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pfstools"; version = "2.1.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv2 qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9efc75240c02..14630896d3f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6284,7 +6284,7 @@ in pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = callPackage ../tools/graphics/pfstools { }; + pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { }; |