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

Fix uzbl build, although in a bit hacky way

Browse Source 
svn path=/nixpkgs/trunk/; revision=16832
This commit is contained in:
Michael Raskin 2009-08-24 13:05:19 +00:00
parent e0bfd8d7e7
commit bdf2bb0bf5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -4,7 +4,7 @@ let
version = a.lib.attrByPath ["version"] "2009.08.08" a; version = a.lib.attrByPath ["version"] "2009.08.08" a;
buildInputs = with a; [ buildInputs = with a; [
pkgconfig webkit libsoup gtk makeWrapper libsoup pkgconfig webkit gtk makeWrapper
]; ];
in in
rec { rec {
@ -18,7 +18,10 @@ rec {
configureFlags = []; configureFlags = [];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doMakeInstall" "doWrap"]; phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
setVars = a.noDepEntry (''
'');
doWrap = a.makeManyWrappers "$out/bin/uzbl" doWrap = a.makeManyWrappers "$out/bin/uzbl"
'' ''
@ -29,6 +32,9 @@ rec {
''; '';
installFlags = "PREFIX=$out"; 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; name = "uzbl-" + version;
meta = { meta = {

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

@ -7211,6 +7211,7 @@ let
inherit pkgconfig webkit makeWrapper; inherit pkgconfig webkit makeWrapper;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup_git_head;
glib = gtkLibs.glib_2_21;
}; };
valknut = import ../applications/networking/p2p/valknut { valknut = import ../applications/networking/p2p/valknut {