From 958ea79a787354d46b72e5c1d5657ddf8dd5f9fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 7 Sep 2008 12:58:56 +0000 Subject: [PATCH] Added Midori - a light, WebKit-based GTK browser. svn path=/nixpkgs/trunk/; revision=12818 --- .../networking/browsers/midori/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/networking/browsers/midori/default.nix diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix new file mode 100644 index 000000000000..15d43e65560a --- /dev/null +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -0,0 +1,34 @@ +args : +let + lib = args.lib; + fetchurl = args.fetchurl; + doPatchShebangs = args.doPatchShebangs; + makeManyWrappers = args.makeManyWrappers; + + version = lib.getAttr ["version"] "0.0.21" args; + buildInputs = with args; [ + intltool python imagemagick gtk glib webkit libxml2 + gtksourceview pkgconfig which gettext makeWrapper + ]; +in +rec { + src = fetchurl { + url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2"; + sha256 = if version == "0.0.21" then + "0cbpvjdfzgbqwn8rfkp3l35scfvz9cc8hip8v35vkxpac9igcqg5" + else null; + }; + + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = ["doUnpack" (doPatchShebangs ".") "doConfigure" + "doMakeInstall" (doPatchShebangs "$out/bin") + (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 bd88cc0681a3..1d43378fa855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6448,6 +6448,13 @@ let inherit fetchurl stdenv python makeWrapper; }; + midori = builderDefsPackage (import ../applications/networking/browsers/midori) { + inherit imagemagick intltool python pkgconfig webkit libxml2 + which gettext makeWrapper; + inherit (gtkLibs) gtk glib; + inherit (gnome) gtksourceview; + }; + minicom = builderDefsPackage (selectVersion ../tools/misc/minicom "2.3") { inherit ncurses; };