diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
| commit | 0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4 (patch) | |
| tree | 1d8b73f5d799dc62efc56a181012abc3e8062c19 /pkgs/applications/office | |
| parent | 0a085d508ac054e45dfe0a7f24d55b29ca9d4ae9 (diff) | |
| parent | 3aa6b8ccc5ad930803e7beb9492f88f6df2c1fdb (diff) | |
| download | nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.gz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.bz2 nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.lz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.xz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.zst nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 39 | ||||
| -rw-r--r-- | pkgs/applications/office/skrooge/default.nix | 8 |
2 files changed, 43 insertions, 4 deletions
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix new file mode 100644 index 000000000000..4b1595db42a4 --- /dev/null +++ b/pkgs/applications/office/scribus/unstable.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchsvn, makeWrapper, pkgconfig, cmake, qtbase, cairo, pixman, +boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, +podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: + +let + pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); + revision = "22730"; +in +stdenv.mkDerivation rec { + name = "scribus-unstable-${version}"; + version = "2018-10-13"; + + src = fetchsvn { + url = "svn://scribus.net/trunk/Scribus"; + rev = revision; + sha256 = "1nlg4qva0fach8fi07r1pakjjlijishpwzlgpnxyaz7r31yjaw63"; + }; + + enableParallelBuilding = true; + + buildInputs = [ + makeWrapper pkgconfig cmake qtbase cairo pixman boost cups fontconfig + freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler + poppler_data pythonEnv harfbuzz qtimageformats qttools + ]; + + postFixup = '' + wrapProgram $out/bin/scribus \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" + ''; + + meta = { + maintainers = [ stdenv.lib.maintainers.erictapen ]; + platforms = stdenv.lib.platforms.linux; + description = "Desktop Publishing (DTP) and Layout program for Linux"; + homepage = http://www.scribus.net; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e2abba26ff71..070ef4845d83 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, - cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, + cmake, extra-cmake-modules, qtwebkit, qtwebengine, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info @@ -7,11 +7,11 @@ mkDerivation rec { name = "skrooge-${version}"; - version = "2.13.0"; + version = "2.16.2"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1f1k0fkfhism1jyx3yxi8rdf1jrmp2vaphmz7fgh9hk18ndvss7d"; + sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ mkDerivation rec { ]; buildInputs = [ - qtwebengine qtscript grantlee kxmlgui kwallet kparts + qtwebkit qtwebengine qtscript grantlee kxmlgui kwallet kparts kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; |