git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108247 from symphorien/paperwork-next
commit06c9dbcece50727ef83dc8096b781d5749759d8a authorSandro <sandro.jaeckel@gmail.com> dateMon 4 Jan 2021, 16:41 (6 years ago) parent097a914d1d3288
4 files changed+14−11
pkgs/applications/office/paperwork/paperwork-gtk.nix+8−7 pkgs/applications/office/paperwork/paperwork-shell.nix+2 pkgs/applications/office/paperwork/src.nix+2−2 pkgs/development/libraries/libinsane/default.nix+2−2
pkgs/applications/office/paperwork/paperwork-gtk.nix+8−7
@@ -2,8 +2,6 @@
22, python3Packages
33, gtk3
44, cairo
5−, aspellDicts
6−, buildEnv
75, gnome3
86, librsvg
97, xvfb_run
@@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec {
4038 make l10n_compile
4139 '';
4240
43− ASPELL_CONF = "dict-dir ${buildEnv {
44− name = "aspell-all-dicts";
45− paths = lib.collect lib.isDerivation aspellDicts;
46− }}/lib/aspell";
47−
4841 postInstall = ''
4942 # paperwork-shell needs to be re-wrapped with access to paperwork
5043 cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
5144 # install desktop files and icons
5245 XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user
46+
47+ # fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find
48+ # resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path
49+ # /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png.
50+ site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk
51+ for i in $site/data/paperwork_*.png; do
52+ ln -s $i $site/icon/out;
53+ done
5354 '';
5455
5556 checkInputs = [ xvfb_run dbus.daemon ];
pkgs/applications/office/paperwork/paperwork-shell.nix+2
@@ -10,6 +10,7 @@
1010, paperwork-backend
1111, fabulous
1212, getkey
13+, psutil
1314
1415, pkgs
1516}:
@@ -34,6 +35,7 @@ buildPythonPackage rec {
3435 paperwork-backend
3536 fabulous
3637 getkey
38+ psutil
3739 ];
3840
3941 checkInputs = [
pkgs/applications/office/paperwork/src.nix+2−2
@@ -1,12 +1,12 @@
11{fetchFromGitLab}:
22rec {
3− version = "2.0.1";
3+ version = "2.0.2";
44 src = fetchFromGitLab {
55 domain = "gitlab.gnome.org";
66 repo = "paperwork";
77 group = "World";
88 owner = "OpenPaperwork";
99 rev = version;
10− sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4";
10+ sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly";
1111 };
1212}
pkgs/development/libraries/libinsane/default.nix+2−2
@@ -17,7 +17,7 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "libinsane";
20− version = "1.0.8";
20+ version = "1.0.9";
2121
2222 outputs = [ "out" "dev" "devdoc" ];
2323
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 group = "World";
2828 owner = "OpenPaperwork";
2929 rev = version;
30− sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44";
30+ sha256 = "1a1lszhq3j11i1jybc5kmn7hhhji44xhjqsxsldsy9l3344rkzv4";
3131 };
3232
3333 nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];