public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use GTK2 for Lazarus and get Unicode support

Browse Source 
svn path=/nixpkgs/trunk/; revision=16363
This commit is contained in:
Michael Raskin 2009-07-14 20:31:11 +00:00
parent 57c8392eee
commit 81d09cd1f3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/fpc/lazarus.nix
View File

@ -7,7 +7,7 @@ rec {
}; };
buildInputs = [fpc gtk glib libXi inputproto buildInputs = [fpc gtk glib libXi inputproto
libX11 xproto libXext xextproto gdkpixbuf libX11 xproto libXext xextproto pango atk
stdenv.gcc makeWrapper]; stdenv.gcc makeWrapper];
configureFlags = []; configureFlags = [];
makeFlags = [ makeFlags = [
@ -21,7 +21,8 @@ rec {
phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
preBuild = fullDepEntry ('' preBuild = fullDepEntry (''
export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext' export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0'
export LCL_PLATFORM=gtk2
ensureDir $out/share ensureDir $out/share
tar xf ${fpc.src} --strip-components=1 -C $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share
sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc
@ -29,7 +30,8 @@ rec {
["minInit" "defEnsureDir" "doUnpack"]; ["minInit" "defEnsureDir" "doUnpack"];
postInstall = fullDepEntry ('' postInstall = fullDepEntry (''
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \
--prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'"
'') ["doMakeInstall" "minInit" "defEnsureDir"]; '') ["doMakeInstall" "minInit" "defEnsureDir"];
name = "lazarus-${version}"; name = "lazarus-${version}";

2
pkgs/top-level/all-packages.nix
View File

@ -1867,7 +1867,7 @@ let
lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
inherit fpc makeWrapper; inherit fpc makeWrapper;
inherit (gtkLibs1x) gtk glib gdkpixbuf; inherit (gtkLibs) gtk glib pango atk;
inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto;
}; };