Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pfstools: fix Qt environment #90276

Merged
merged 1 commit into from
Oct 26, 2020
Merged

pfstools: fix Qt environment #90276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/tools/graphics/pfstools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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 [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down