diff options
author | Peter Simons <simons@cryp.to> | 2014-05-07 22:13:35 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-05-07 23:11:51 +0200 |
commit | c61d607340391bad86cd4167527874dd8d7552e5 (patch) | |
tree | 50a59f67e7e84e06409746e669619a1a2e009563 /pkgs/applications/science/electronics/tkgate/2.x.nix | |
parent | 8c75363c719f1ac161a295f240dedf339863f092 (diff) | |
download | nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar.gz nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar.bz2 nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar.lz nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar.xz nixlib-c61d607340391bad86cd4167527874dd8d7552e5.tar.zst nixlib-c61d607340391bad86cd4167527874dd8d7552e5.zip |
tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute
Diffstat (limited to 'pkgs/applications/science/electronics/tkgate/2.x.nix')
-rw-r--r-- | pkgs/applications/science/electronics/tkgate/2.x.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index fdb9e9b56929..25c6a309cf37 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +{ stdenv, fetchurl, tcl, tk, libX11, glibc }: +let + libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include"; + libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib"; +in stdenv.mkDerivation rec { name = "tkgate-2.0-b10"; @@ -16,8 +18,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i configure \ - -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvOrLibc}/include"|' \ - -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib"|' + -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvInc}"|' \ + -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvLib}"|' sed -i options.h \ -e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \ -e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|' |