diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-24 14:24:47 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-24 14:24:47 +0000 |
| commit | c4b524f2fa8a31bdc6728cd38f19672ea5d1a797 (patch) | |
| tree | abb980ef62ac852a7d7d9dbb4040e8a54fdcd122 | |
| parent | bdf2bb0bf5967844cde4be41c6ad1c1b700b41f3 (diff) | |
Removing midori from hydra; currently I see no easy solution without GTK rebuild
svn path=/nixpkgs/trunk/; revision=16833
| -rw-r--r-- | pkgs/applications/networking/browsers/midori/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 242a66b2b95b7..c0104f592592c 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -24,10 +24,14 @@ rec { configureFlags = []; /* doConfigure should be specified separately */ - phaseNames = ["doUnpack" (doPatchShebangs ".") "doConfigure" - "doMakeInstall" (doPatchShebangs "$out/bin") - (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1")]; + phaseNames = ["doUnpack" "shebangsHere" "doConfigure" + "doMakeInstall" "shebangsInstalled" "wrapWK" + ]; + shebangsHere = (doPatchShebangs "."); + shebangsInstalled = (doPatchShebangs "$out/bin"); + wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); + name = "midori-" + version; meta = { description = "Light WebKit-based web browser with GTK GUI."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 083a279ba36c8..7040dbfeee7c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6765,9 +6765,10 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify; - inherit (gtkLibs) gtk glib; + inherit (gtkLibs) gtk; inherit (gnome) gtksourceview; libsoup = gnome26.libsoup_git_head; + glib = gtkLibs.glib_2_21; }; minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c5e00663cf960..9827f2b65695c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -238,7 +238,7 @@ in { mdadm = linux; mercurial = allBut "i686-cygwin"; mesa = linux ++ darwin; - midori = linux; + #midori = linux; mingetty = linux; mk = linux; mktemp = all; |