MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pfstools: fix netpbm inclusion

Browse source 
The main CMakeLists.txt no longer includes the FindNETPBM.cmake file.
This commit removes the comment on the `include` statement to re-enable
including the FindNETPBM.cmake file.

Moreover the netpbm libraries weren't found due to the name searched for
included an extraneous `.` The
`stdenv.hostPlatform.extensions.sharedLibrary` expressions resolves to
".so" on x86_64-linux which means that the `-name` flag gets passed
"*..so*" instead of "*.so*". This commit ensures that "*.so*" is passed
when looking for the netpbm shared objects.
This commit is contained in:
Viktor Kronvall 2022-11-09 19:53:34 +09:00
parent 29e71a7193
commit 69b41f9880
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/graphics/pfstools/default.nix
View file

@ -18,9 +18,11 @@ mkDerivation rec {
cmakeFlags = [ "-DWITH_MATLAB=false" ];
preConfigure = ''
sed -e 's|#include( ''${PROJECT_SRC_DIR}/cmake/FindNETPBM.cmake )|include( ''${PROJECT_SOURCE_DIR}/cmake/FindNETPBM.cmake )|' -i CMakeLists.txt
rm cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake
echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake