From eee815842a4a27f60446bab6a73db13b7cc9832a Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 13 Jun 2020 19:52:52 -0700 Subject: [PATCH] pfstools: fix Qt environment --- pkgs/tools/graphics/pfstools/default.nix | 8 ++++---- 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 1c437a3f05c..f570251374c 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 062e5bc97bc..26234e1d582 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5951,7 +5951,7 @@ in pfetch = callPackage ../tools/misc/pfetch { }; - pfstools = callPackage ../tools/graphics/pfstools { }; + pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; philter = callPackage ../tools/networking/philter { };