diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-24 13:05:19 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-24 13:05:19 +0000 |
commit | bdf2bb0bf5967844cde4be41c6ad1c1b700b41f3 (patch) | |
tree | 97da82b779f97148d9f7ea87e01905036550b68e /pkgs | |
parent | e0bfd8d7e7752356167e7a9efb95b19940a771bb (diff) |
Fix uzbl build, although in a bit hacky way
svn path=/nixpkgs/trunk/; revision=16832
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index e521d14827bff..b58d273d62112 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -4,7 +4,7 @@ let version = a.lib.attrByPath ["version"] "2009.08.08" a; buildInputs = with a; [ - pkgconfig webkit libsoup gtk makeWrapper + libsoup pkgconfig webkit gtk makeWrapper ]; in rec { @@ -18,7 +18,10 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall" "doWrap"]; + phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"]; + + setVars = a.noDepEntry ('' + ''); doWrap = a.makeManyWrappers "$out/bin/uzbl" '' @@ -29,6 +32,9 @@ rec { ''; installFlags = "PREFIX=$out"; + makeFlags = [ + "CC='gcc ${a.glib}/lib/libglib-2.0.so ${a.glib}/lib/libgio-2.0.so ${a.glib}/lib/libgobject-2.0.so' " + ]; name = "uzbl-" + version; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa7cfdd878cab..083a279ba36c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7211,6 +7211,7 @@ let inherit pkgconfig webkit makeWrapper; inherit (gtkLibs) gtk; libsoup = gnome26.libsoup_git_head; + glib = gtkLibs.glib_2_21; }; valknut = import ../applications/networking/p2p/valknut { |