diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-03 14:17:22 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-03 14:17:22 +0000 |
commit | 540214e9fd7ecd5cdfd87c37dfa943e02f8e2d04 (patch) | |
tree | 2c4be4e8dcd8cd6ab63ecdf818de40e72a56fa4f | |
parent | f763d29010e491293554cf8fe2320b31847f566c (diff) |
Fixed stable socat (applied patch by Nicolas Pierron); updated Tk installation step for XMaxima compatibility
svn path=/nixpkgs/trunk/; revision=10482
-rw-r--r-- | pkgs/development/libraries/tk/8.4.16.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/tk/builder.sh | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/tk/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/socat/1.6.0.0.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
5 files changed, 30 insertions, 32 deletions
diff --git a/pkgs/development/libraries/tk/8.4.16.nix b/pkgs/development/libraries/tk/8.4.16.nix new file mode 100644 index 0000000000000..c43e53cc82797 --- /dev/null +++ b/pkgs/development/libraries/tk/8.4.16.nix @@ -0,0 +1,18 @@ +args: with args; + +stdenv.mkDerivation { + name = "tk-${version}"; + src = fetchurl { + url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz"; + sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb"; + }; + postInstall = '' + echo -e '#! /bin/sh \n $( readlink -f $( which wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish + chmod a+x $out/bin/wish + ''; + configureFlags="--with-tcl=${tcl}/lib"; + preConfigure = "cd unix"; + + buildInputs = [tcl x11]; + inherit tcl; +} diff --git a/pkgs/development/libraries/tk/builder.sh b/pkgs/development/libraries/tk/builder.sh deleted file mode 100644 index 999488a353101..0000000000000 --- a/pkgs/development/libraries/tk/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-tcl=$tcl/lib" -preConfigure() { - cd unix -} - -preConfigure=preConfigure - -genericBuild diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix deleted file mode 100644 index 9e0a6b8c0dae8..0000000000000 --- a/pkgs/development/libraries/tk/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, tcl, x11}: - -stdenv.mkDerivation { - name = "tk-8.4.16"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://sourceforge/tcl/tk8.4.16-src.tar.gz; - sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb"; - }; - buildInputs = [tcl x11]; - inherit tcl; -} diff --git a/pkgs/tools/networking/socat/1.6.0.0.nix b/pkgs/tools/networking/socat/1.6.0.0.nix index 80dd1276a1048..1e176f477205c 100644 --- a/pkgs/tools/networking/socat/1.6.0.0.nix +++ b/pkgs/tools/networking/socat/1.6.0.0.nix @@ -6,15 +6,14 @@ args : with args; with builderDefs {src="";} null; sha256 = "1j01iazwfr63q71cfcfzrdz8digqlg3ldhlbb72yl5mn9awr0w0m"; }; patches = [ - fetchurl { - url = http://www.dest-unreach.org/socat/contrib/socat-servicenames.patch; - sha256 = "1r8zd6mk257n01i34i5syxl2k6fr35nlr7bqs9sfc79irjl62z66"; - }; - fetchurl { - url = http://www.dest-unreach.org/socat/contrib/socat-maxfds.patch.gz; - sha256 = "0fsn0k0qsrdbjbhj09a6kxfsxb7yhxs4cad26znd9naginsj7pxa"; - }; - + (fetchurl { + url = http://www.dest-unreach.org/socat/contrib/socat-servicenames.patch; + sha256 = "1r8zd6mk257n01i34i5syxl2k6fr35nlr7bqs9sfc79irjl62z66"; + }) + (fetchurl { + url = http://www.dest-unreach.org/socat/contrib/socat-maxfds.patch.gz; + sha256 = "0fsn0k0qsrdbjbhj09a6kxfsxb7yhxs4cad26znd9naginsj7pxa"; + }) ]; buildInputs = [openssl]; configureFlags = []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51f94b858d795..6ac651b05e25d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2660,10 +2660,13 @@ rec { qt = qt4; }; - tk = import ../development/libraries/tk { + tkFun = lib.sumArgs (selectVersion ../development/libraries/tk) { inherit fetchurl stdenv tcl x11; + version = "8.4.16"; }; + tk = tkFun null; + unixODBC = import ../development/libraries/unixODBC { inherit fetchurl stdenv; }; |