pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
|
||||
{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
|
||||
@@ -7,6 +7,6 @@ callPackage ./generic.nix (args // {
|
||||
sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
|
||||
};
|
||||
|
||||
patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
|
||||
patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
|
||||
|
||||
})
|
||||
|
||||
@@ -21,15 +21,15 @@ stdenv.mkDerivation {
|
||||
cp ../{unix,generic}/*.h $out/include
|
||||
ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
''
|
||||
+ stdenv.lib.optionalString (stdenv.isDarwin) ''
|
||||
+ lib.optionalString (stdenv.isDarwin) ''
|
||||
cp ../macosx/*.h $out/include
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-threads"
|
||||
"--with-tcl=${tcl}/lib"
|
||||
] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
|
||||
++ stdenv.lib.optional enableAqua "--enable-aqua";
|
||||
] ++ lib.optional stdenv.is64bit "--enable-64bit"
|
||||
++ lib.optional enableAqua "--enable-aqua";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
|
||||
libdir = "lib/${libPrefix}";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
|
||||
homepage = "https://www.tcl.tk/";
|
||||
license = licenses.tcltk;
|
||||
|
||||
Reference in New Issue
Block a user