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

pfstools: build pfsalign (fix #60843) (#61050)

Browse Source
This commit is contained in:
Julien Dehos 2019-11-02 19:00:39 +01:00 committed by Renaud
parent 7828823386
commit 8ca3cad711
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat , openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt5 , fftw, gsl, libexif, perl, opencv, qt5
}: }:
@ -20,11 +20,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
openexr zlib imagemagick libGLU_combined freeglut fftwFloat openexr zlib imagemagick fftwFloat
fftw gsl libexif perl opencv qt5.qtbase fftw gsl libexif perl opencv qt5.qtbase
]; ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT
]) else [
libGLU_combined freeglut
]);
patches = [ ./threads.patch ./pfstools.patch ]; patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://pfstools.sourceforge.net/; homepage = http://pfstools.sourceforge.net/;

12
pkgs/tools/graphics/pfstools/pfsalign.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/src/camera/CMakeLists.txt 2017-11-13 18:38:27.000000000 +0100
+++ b/src/camera/CMakeLists.txt 2018-12-30 14:55:30.235571520 +0100
@@ -9,7 +9,7 @@ target_link_libraries(${TRG} pfs)
install (TARGETS ${TRG} DESTINATION bin)
install (FILES ${TRG}.1 DESTINATION ${MAN_DIR})
-if( OpenCV_FOUND AND EXIF_FOUND )
+if( OpenCV_FOUND AND MYPKG_FOUND )
set(TRG pfsalign)
add_executable(${TRG} ${TRG}.cpp "${GETOPT_OBJECT}")