Commit Graph

49 Commits

Author SHA1 Message Date
Ryan Burns
a86e1f5dac tk: fix missing definition in macOS header 2021-09-23 00:45:23 -07:00
Alyssa Ross
73e2ac54a7 tk: enableParallelBuilding
Tested at -j48.
2021-09-02 19:53:31 +00:00
Ricardo M. Correia
d9bf02324a tk-8_6: fix hash after tcl-8_6 update
tcl-8_6 was updated in 4fb92ae60d from
8.6.9 -> 8.6.11 but tk's hash wasn't updated at the same time,
which means the current hash was still from tk 8.6.9 rather than 8.6.11.
2021-06-06 01:40:39 +02:00
Andrew Brooks
98b8fc3579 tk: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:08 -05:00
nixinator
390b3b192d tk-8.6.6: demos/hello: exec: wish8.6: not found. fixes #31311 2021-04-21 03:41:56 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
hannesweisbach
371e2622c0
tk: fix build on darwin
Installing libtk on macOS 10.15.5 resulted in a following warning:

    warning: skipping dangling symlink '/nix/store/3whl4256v6qf15dsm1d5mf0lzhfh6w06-user-environment/lib/libtk.so'

which was caused by the following code in generic.nix of the tk derivation:

    ln -s $out/lib/libtk${super.tcl.release}.so $out/lib/libtk.so

Shared libraries on macOS are suffixed `.dylib' not 'so' so
libtk${version}.so does not actually exist. Consequently a symlink from
libtk.dylib is never created and linking against tk fails.
2020-08-15 17:37:13 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Daiderd Jordan
3a57f5095f
tk: remove cf-private 2019-07-03 22:20:25 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Wael Nasreddine
915085c6de
tk: add missing headers for Darwin (#62125) 2019-05-27 11:54:51 -07:00
c0bw3b
3ee1b52371 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
2019-04-27 07:09:05 +02:00
Matthew Bauer
66a3a7b303 tk: propagate macos dependencies 2019-04-26 21:55:00 -04:00
Matthew Bauer
82b8393bc4 tk: use aqua backend on darwin
Most users don’t have xquartz, so let’s use the default window system
for macOS.
2019-04-09 21:44:38 -04:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Symphorien Gibol
87ef971478 tk: add private headers to /include
those are necessary to build some extensions like tix
2017-01-04 15:49:27 +01:00
Eelco Dolstra
b31870fe13 tk: Use a dev output
This ensures that the propagated build inputs don't end up in tcl/tk's
runtime closure, which is reduced by about 5 MiB.
2016-09-01 18:57:43 +02:00
Eelco Dolstra
02683acf71 tk: Separate man output
This reduces the size of the main output by half a megabyte.
2016-09-01 18:57:43 +02:00
Rahul Gopinath
0ba631d5bb tcl/tk: 8.6.4 -> 8.6.6 2016-07-28 16:19:08 -07:00
Tim Cuthbertson
6145b6b7d6 tk: propagate dependency on tcl & libXft 2016-06-20 20:03:05 +10:00
Josef Knedl
5e1da18b6d tk: Fixes NixOS/nixpkgs#13377 (bad install_name)
Patch is based on: https://trac.macports.org/changeset/100816
of bug report: https://trac.macports.org/ticket/37395
2016-02-25 17:57:22 +01:00
Luca Bruno
6551af69eb add tk-8_5 and fix xconq (XHF) 2015-06-19 16:06:10 +02:00
William A. Kennington III
5835d577e7 tcl/tk: Refactor and add maintainers 2015-04-30 18:49:27 -07:00
William A. Kennington III
55a64a5ddb tcl/tk: Tie versioning together and propagate 2015-04-26 20:55:42 -07:00
William A. Kennington III
6d0bfb1b19 tk: 8.5.15 -> 8.6.4 2015-03-29 14:01:38 -07:00
Vladimír Čunát
086d6c802b tk on darwin: another attempt to fix build
They add the -lfontconfig explicitly in macports, so hopefully it fixes it.
https://trac.macports.org/browser/trunk/dports/x11/tk/Portfile
2014-04-13 14:56:54 +02:00
Vladimír Čunát
0feb117c20 tk: attempt to fix build on darwin
It complained about missing fontconfig symbols.
Also fix some white-space.
2014-04-12 10:44:17 +02:00
Song Wenwu
299af2ff45 tk: fix issue #1479 2014-01-25 10:36:20 +08:00
Song Wenwu
81c6ff16dd tk: update to 8.5.15, enable xft support 2014-01-25 08:45:56 +08:00
Jason \"Don\" O'Conal
9007e57f28 python27: compile with tkinterp on darwin 2013-07-04 13:11:25 +02:00
Jason \"Don\" O'Conal
bd61c42d22 tk: fix build on darwin 2013-07-04 13:11:24 +02:00
Marc Weber
932899f3da Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Marc Weber
3157bb1098 removed all __primops from nixpkgs
svn path=/nixpkgs/trunk/; revision=15693
2009-05-24 10:57:46 +00:00
Lluís Batlle i Rossell
3b3799f4c2 I forgot a file for the new tk. Here it is.
svn path=/nixpkgs/trunk/; revision=15435
2009-05-03 14:36:26 +00:00
Peter Simons
cff0831471 tk: update to 8.4.18
svn path=/nixpkgs/trunk/; revision=12295
2008-07-07 11:46:01 +00:00
Michael Raskin
3ba61eafa7 Fixed wish in Tk
svn path=/nixpkgs/trunk/; revision=10496
2008-02-04 14:24:40 +00:00
Michael Raskin
540214e9fd Fixed stable socat (applied patch by Nicolas Pierron); updated Tk installation step for XMaxima compatibility
svn path=/nixpkgs/trunk/; revision=10482
2008-02-03 14:17:22 +00:00
Armijn Hemel
d37920ffa4 8.4.16
svn path=/nixpkgs/trunk/; revision=10014
2007-12-31 19:40:03 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel
c57e252798 pass around right configuration options
svn path=/nixpkgs/trunk/; revision=5871
2006-07-22 10:52:44 +00:00
Armijn Hemel
d53ae3e6a3 add tk
svn path=/nixpkgs/trunk/; revision=5870
2006-07-22 09:58:05 +00:00