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

netpbm: split into multiple outputs

Browse Source
This commit is contained in:
Jan Tojnar
2020-03-01 15:13:03 +01:00
parent 90180905a2
commit 9555834399
7 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/netpbm/default.nix
+4
View File
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
name = "netpbm-10.89.1";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
rev = "3735";
@@ -96,6 +98,8 @@ stdenv.mkDerivation {
wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin"
done
moveToOutput bin "''${!outputBin}"
runHook postInstall
'';
pkgs/tools/graphics/pfstools/default.nix
+3 -3
View File
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
preConfigure = ''
rm cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_INCLUDE_DIR ${netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_INCLUDE_DIR ${stdenv.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
'';
pkgs/tools/graphics/sng/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng ];
configureFlags = [
"--with-rgbtxt=${netpbm}/share/netpbm/misc/rgb.txt"
"--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt"
];
meta = with stdenv.lib; {