diff options
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/aesop/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/office/bookworm/default.nix | 40 | ||||
-rw-r--r-- | pkgs/applications/office/spice-up/default.nix | 18 |
3 files changed, 50 insertions, 29 deletions
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 64e2c0b94679..b510fe950a3d 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3 +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3 , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "aesop"; - version = "1.0.5"; + version = "1.0.7"; name = "${pname}-${version}"; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee granite gtk3 @@ -34,14 +35,6 @@ stdenv.mkDerivation rec { poppler ]; - # Fix build with vala 0.42 - patches = [ - (fetchpatch { - url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch"; - sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -49,9 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The simplest PDF viewer around"; - homepage = https://github.com/lainsce/aesop; - license = licenses.gpl2Plus; + homepage = https://github.com/lainsce/aesop; + license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 45c794c82ea5..bc2f260c7030 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,46 +1,70 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3 -, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3 +, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.0.0"; + version = "4f7b118281667d22f1b3205edf0b775341fa49cb"; - name = "${pname}-${version}"; + name = "${pname}-2018-10-21"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; rev = version; - sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520"; + sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9"; }; + # See: https://github.com/babluboy/bookworm/pull/220 + patches = [ + (fetchpatch { + url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch"; + sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975"; + }) + ]; + nativeBuildInputs = [ - cmake + bash gobjectIntrospection libxml2 + meson ninja pkgconfig - vala + python3 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = with gnome3; [ glib + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged granite gtk3 html2text libgee poppler + python2 sqlite webkitgtk ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + # These programs are expected in PATH from the source code and scripts preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}" + --prefix PATH : $out/bin ) ''; + postFixup = '' + patchShebangs $out/share/bookworm/scripts/mobi_lib/*.py + patchShebangs $out/share/bookworm/scripts/tasks/*.sh + ''; + meta = with stdenv.lib; { description = "A simple, focused eBook reader"; longDescription = '' diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 520510698e3c..3141223d7283 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -12,25 +12,27 @@ , ninja , libgudev , libevdev -, vala +, libsoup +, vala_0_40 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "spice-up-${version}"; - version = "1.3.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "087cdi7na93pgz7vf046h94v5ydvpiccpwhllq85ix8g4pa5rp85"; + sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq"; }; + USER = "nix-build-user"; nativeBuildInputs = [ pkgconfig wrapGAppsHook - vala + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake ninja gettext @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { gobjectIntrospection # For setup hook ]; buildInputs = [ - gtk3 - granite + gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee + granite + gtk3 json-glib - libgudev libevdev + libgudev + libsoup ]; meta = with stdenv.lib; { |