diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tk')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/tk/8.6.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/tk/generic.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tk/8.6.nix b/nixpkgs/pkgs/development/libraries/tk/8.6.nix index c30f9a819478..fdffbeba2c93 100644 --- a/nixpkgs/pkgs/development/libraries/tk/8.6.nix +++ b/nixpkgs/pkgs/development/libraries/tk/8.6.nix @@ -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 ]; }) diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index 1cbf4026cb88..57dc3dac2d09 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkgconfig, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] , enableAqua ? stdenv.isDarwin, darwin , ... }: @@ -21,17 +21,17 @@ 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 = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); propagatedBuildInputs = [ tcl libXft ]; @@ -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; |