diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-04-22 23:47:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-27 07:09:05 +0200 |
commit | 3ee1b5237118b8380141382ce82cb9732f06d4d0 (patch) | |
tree | a4cde2c45dc121ce310ad54be367f0ddba36aa91 /pkgs/development/libraries/tk | |
parent | 959b199991fccfd11f13c0c7351c4c0d2a0747b5 (diff) |
tcl/tk: 8.6.6 -> 8.6.9
Changelog for Tcl: https://github.com/tcltk/tcl/blob/core-8-6-9/changes#L8797 Changelog for Tk: https://github.com/tcltk/tk/blob/master/changes#L7417 Tk release is actually v8.6.9.1 while Tcl is v8.6.9
Diffstat (limited to 'pkgs/development/libraries/tk')
-rw-r--r-- | pkgs/development/libraries/tk/8.6.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/tk/generic.nix | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index cd8d42faa9144..5013db64bbae9 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -3,8 +3,8 @@ callPackage ./generic.nix (args // rec { src = fetchurl { - url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - sha256 = "17diivcfcwdhp4v5zi6j9nkxncccjqkivhp363c4wx5lf4d3fb6n"; + url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x + sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; }; patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index bd2453aad9a16..10b8bc7cd7179 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -19,11 +19,14 @@ stdenv.mkDerivation { postInstall = '' ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include + ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so ''; configureFlags = [ + "--enable-threads" "--with-tcl=${tcl}/lib" - ] ++ stdenv.lib.optional enableAqua "--enable-aqua"; + ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" + ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; @@ -44,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; - homepage = http://www.tcl.tk/; + homepage = https://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ lovek323 vrthra ]; |