MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute

Browse source
This commit is contained in:
Peter Simons 2014-05-07 22:13:35 +02:00
parent 8c75363c71
commit c61d607340
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/science/electronics/tkgate/1.x.nix
View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc, which, yacc, flex, imake, xproto, gccmakedep }: { stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tkgate-1.8.7"; name = "tkgate-1.8.7";
@ -10,13 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
}; };
buildInputs = [ tcl tk libX11 libiconvOrLibc which yacc flex imake xproto gccmakedep ]; buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ];
patchPhase = '' patchPhase = ''
sed -i config.h \ sed -i config.h \
-e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "8.5"|' \ -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_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
-e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib ${libX11}/lib"|' \ -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 TCL_LIBRARY "${tcl}/lib"' \
-e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \

12
pkgs/applications/science/electronics/tkgate/2.x.nix
View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc }: { stdenv, fetchurl, tcl, tk, libX11, glibc }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tkgate-2.0-b10"; name = "tkgate-2.0-b10";
@ -16,8 +18,8 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
sed -i configure \ sed -i configure \
-e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvOrLibc}/include"|' \ -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvInc}"|' \
-e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib"|' -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvLib}"|'
sed -i options.h \ sed -i options.h \
-e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \ -e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \
-e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|' -e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|'