JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tk-8_5 and fix xconq (XHF)

Browse Source
This commit is contained in:
Luca Bruno 2015-06-19 15:54:35 +02:00
parent ffb70f9c51
commit 6551af69eb
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/tk/8.5.nix Normal file
View File

@ -0,0 +1,11 @@
{ callPackage, fetchurl, tcl, ... } @ args:
callPackage ./generic.nix (args // rec {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
};
})

13
pkgs/development/libraries/tk/8.6.nix Normal file
View File

@ -0,0 +1,13 @@
{ callPackage, fetchurl, tcl, ... } @ args:
callPackage ./generic.nix (args // rec {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
};
patches = [ ./different-prefix-with-tcl.patch ];
})

9
pkgs/development/libraries/tk/default.nix → pkgs/development/libraries/tk/generic.nix
View File

@ -1,14 +1,9 @@
{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
stdenv.mkDerivation {
name = "tk-${tcl.version}";
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
};
patches = [ ./different-prefix-with-tcl.patch ];
inherit src patches;
postInstall = ''
ln -s $out/bin/wish* $out/bin/wish

10
pkgs/top-level/all-packages.nix
View File

@ -8087,7 +8087,10 @@ let
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
tk = callPackage ../development/libraries/tk { };
tk = tk-8_6;
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
tnt = callPackage ../development/libraries/tnt { };
@ -13568,7 +13571,10 @@ let
xboard = callPackage ../games/xboard { };
xconq = callPackage ../games/xconq {};
xconq = callPackage ../games/xconq {
tcl = tcl-8_5;
tk = tk-8_5;
};
# TODO: the corresponding nix file is missing
# xracer = callPackage ../games/xracer { };