diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-06-19 15:54:35 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-06-19 16:06:10 +0200 |
| commit | 6551af69eb9b1865d2797712aeea25b174a738fd (patch) | |
| tree | 48f21bbd33d31933b7e8f30c9156025eeaa4ae65 /pkgs/development | |
| parent | ffb70f9c51b35bf7a66f5daa20345bad7b97f4c1 (diff) | |
| download | nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar.gz nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar.bz2 nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar.lz nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar.xz nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.tar.zst nixlib-6551af69eb9b1865d2797712aeea25b174a738fd.zip | |
add tk-8_5 and fix xconq (XHF)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/tk/8.5.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/tk/8.6.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/tk/generic.nix (renamed from pkgs/development/libraries/tk/default.nix) | 9 |
3 files changed, 26 insertions, 7 deletions
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 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 |