public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90276 from Ralith/pfsfix

Browse Source 
pfstools: fix Qt environment
This commit is contained in:
Anderson Torres 2020-10-26 08:39:23 -03:00 committed by GitHub
commit ad19f56230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/graphics/pfstools/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin { stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , 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"; pname = "pfstools";
version = "2.1.0"; version = "2.1.0";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
openexr zlib imagemagick fftwFloat 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; [ ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT OpenGL GLUT
]) else [ ]) else [

2
pkgs/top-level/all-packages.nix
View File

@ -6284,7 +6284,7 @@ in
pfetch = callPackage ../tools/misc/pfetch { }; pfetch = callPackage ../tools/misc/pfetch { };
pfstools = callPackage ../tools/graphics/pfstools { }; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
philter = callPackage ../tools/networking/philter { }; philter = callPackage ../tools/networking/philter { };