From 6551af69eb9b1865d2797712aeea25b174a738fd Mon Sep 17 00:00:00 2001 From: Luca Bruno <lethalman88@gmail.com> Date: Fri, 19 Jun 2015 15:54:35 +0200 Subject: [PATCH] add tk-8_5 and fix xconq (XHF) --- pkgs/development/libraries/tk/8.5.nix | 11 +++++++++++ pkgs/development/libraries/tk/8.6.nix | 13 +++++++++++++ .../libraries/tk/{default.nix => generic.nix} | 9 ++------- pkgs/top-level/all-packages.nix | 10 ++++++++-- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/tk/8.5.nix create mode 100644 pkgs/development/libraries/tk/8.6.nix rename pkgs/development/libraries/tk/{default.nix => generic.nix} (76%) diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix new file mode 100644 index 000000000000..c3396dcdad22 --- /dev/null +++ b/pkgs/development/libraries/tk/8.5.nix @@ -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"; + }; + +}) + diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix new file mode 100644 index 000000000000..110151227bdd --- /dev/null +++ b/pkgs/development/libraries/tk/8.6.nix @@ -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 ]; + +}) + diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/generic.nix similarity index 76% rename from pkgs/development/libraries/tk/default.nix rename to pkgs/development/libraries/tk/generic.nix index a847f848a02a..c3bab0b2f868 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c48bf060d4f5..278c8d623796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };