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/1.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/1.x.nix')
-rw-r--r-- | pkgs/applications/science/electronics/tkgate/1.x.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 07c266c62c52..1feac0b31c17 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc, which, yacc, flex, imake, xproto, gccmakedep }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }: +let + libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include"; + libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib"; +in stdenv.mkDerivation rec { name = "tkgate-1.8.7"; @@ -10,13 +12,13 @@ stdenv.mkDerivation rec { sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; - buildInputs = [ tcl tk libX11 libiconvOrLibc which yacc flex imake xproto gccmakedep ]; + buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ]; patchPhase = '' sed -i config.h \ -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "8.5"|' \ - -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvOrLibc}/include ${libX11}/include"|' \ - -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib ${libX11}/lib"|' \ + -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \ + -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \ \ -e '20 i #define TCL_LIBRARY "${tcl}/lib"' \ -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ |