diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-07-14 20:31:11 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-07-14 20:31:11 +0000 |
commit | 81d09cd1f361262e7f417b2d23ab3c8287fb4d3d (patch) | |
tree | 50a344b61392a081707d4e794de2899925a527c7 /pkgs | |
parent | 57c8392eee9bc241dc69bc6c6c2f2c7923c567a3 (diff) | |
download | nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar.gz nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar.bz2 nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar.lz nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar.xz nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.tar.zst nixlib-81d09cd1f361262e7f417b2d23ab3c8287fb4d3d.zip |
Use GTK2 for Lazarus and get Unicode support
svn path=/nixpkgs/trunk/; revision=16363
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/fpc/lazarus.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 06bca387f7da..9a3ff77e1c36 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -7,7 +7,7 @@ rec { }; buildInputs = [fpc gtk glib libXi inputproto - libX11 xproto libXext xextproto gdkpixbuf + libX11 xproto libXext xextproto pango atk stdenv.gcc makeWrapper]; configureFlags = []; makeFlags = [ @@ -21,7 +21,8 @@ rec { phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; 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 tar xf ${fpc.src} --strip-components=1 -C $out/share sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc @@ -29,7 +30,8 @@ rec { ["minInit" "defEnsureDir" "doUnpack"]; 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"]; name = "lazarus-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d91af769c18..94735c860658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1867,7 +1867,7 @@ let lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit fpc makeWrapper; - inherit (gtkLibs1x) gtk glib gdkpixbuf; + inherit (gtkLibs) gtk glib pango atk; inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto; }; |