diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-18 21:15:35 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-18 21:15:35 +0200 |
| commit | 62791c3743629e08da4e2f6c58e7d64be0df6dd8 (patch) | |
| tree | 17821fa81ba5e22ead9545c9e2451cc3e005a093 /pkgs/applications/office | |
| parent | fa4a3af5a70ecc628d1467eb5c4b89a479633ce6 (diff) | |
| parent | 6b3832a5194feacf4e9708fe94869f3aa7781296 (diff) | |
| download | nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar.gz nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar.bz2 nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar.lz nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar.xz nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.tar.zst nixpkgs-62791c3743629e08da4e2f6c58e7d64be0df6dd8.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/paperwork/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index adbd4c30a39..79e4b8debc9 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil + paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools ]; makeWrapperArgs = [ diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eef57179b3e..3c5ae4c4b0a 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, -podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools, harfbuzzFull }: +podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); @@ -20,7 +20,7 @@ mkDerivation rec { buildInputs = [ qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler - poppler_data pythonEnv harfbuzz qtimageformats qttools harfbuzzFull + poppler_data pythonEnv qtimageformats qttools harfbuzzFull ]; meta = { |