pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Environment variables
|
||||
STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
|
||||
STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
|
||||
|
||||
postPatch = ''
|
||||
# Install libnetpbm.so symlink to correct destination
|
||||
@@ -68,12 +68,12 @@ stdenv.mkDerivation {
|
||||
echo "STATICLIB_TOO = N" >> config.mk
|
||||
|
||||
# Enable cross-compilation
|
||||
echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
|
||||
echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
|
||||
echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
|
||||
echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
|
||||
echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
|
||||
echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk
|
||||
echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
|
||||
echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
|
||||
|
||||
# Use libraries from Nixpkgs
|
||||
echo "TIFFLIB = libtiff.so" >> config.mk
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
|
||||
|
||||
# Fix path to rgb.txt
|
||||
echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
|
||||
echo "NETPBMLIBTYPE = dylib" >> config.mk
|
||||
echo "NETPBMLIBSUFFIX = dylib" >> config.mk
|
||||
@@ -120,6 +120,6 @@ stdenv.mkDerivation {
|
||||
homepage = "http://netpbm.sourceforge.net/";
|
||||
description = "Toolkit for manipulation of graphic images";
|
||||
license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user