diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-26 00:41:09 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-01 15:13:03 +0100 |
| commit | 95558343993bcae045b955dfc96737ba733e1c69 (patch) | |
| tree | 9899f5245b47ccb216cd7d2f83498e16bcc78b20 /pkgs/tools/graphics | |
| parent | 90180905a2557aefaf4f9ca5416968d829254861 (diff) | |
| download | nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar.gz nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar.bz2 nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar.lz nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar.xz nixlib-95558343993bcae045b955dfc96737ba733e1c69.tar.zst nixlib-95558343993bcae045b955dfc96737ba733e1c69.zip | |
netpbm: split into multiple outputs
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/pfstools/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/graphics/sng/default.nix | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2755b6b2a0e5..f50b9d63f002 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -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 ''; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 6a0385614e87..668f73c04f42 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -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 ''; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index c7d2f49406b7..71bf0160a1e1 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -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; { |