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

Removing midori from hydra; currently I see no easy solution without GTK rebuild

Browse Source 
svn path=/nixpkgs/trunk/; revision=16833
This commit is contained in:
Michael Raskin 2009-08-24 14:24:47 +00:00
parent bdf2bb0bf5
commit c4b524f2fa
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,14 @@ rec {
configureFlags = []; configureFlags = [];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["doUnpack" (doPatchShebangs ".") "doConfigure" phaseNames = ["doUnpack" "shebangsHere" "doConfigure"
"doMakeInstall" (doPatchShebangs "$out/bin") "doMakeInstall" "shebangsInstalled" "wrapWK"
(makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1")]; ];
shebangsHere = (doPatchShebangs ".");
shebangsInstalled = (doPatchShebangs "$out/bin");
wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
name = "midori-" + version; name = "midori-" + version;
meta = { meta = {
description = "Light WebKit-based web browser with GTK GUI."; description = "Light WebKit-based web browser with GTK GUI.";

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

@ -6765,9 +6765,10 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) { midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2 inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify; which gettext makeWrapper file libidn sqlite docutils libnotify;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk;
inherit (gnome) gtksourceview; inherit (gnome) gtksourceview;
libsoup = gnome26.libsoup_git_head; libsoup = gnome26.libsoup_git_head;
glib = gtkLibs.glib_2_21;
}; };
minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") {

2
pkgs/top-level/release.nix
View File

@ -238,7 +238,7 @@ in {
mdadm = linux; mdadm = linux;
mercurial = allBut "i686-cygwin"; mercurial = allBut "i686-cygwin";
mesa = linux ++ darwin; mesa = linux ++ darwin;
midori = linux; #midori = linux;
mingetty = linux; mingetty = linux;
mk = linux; mk = linux;
mktemp = all; mktemp = all;