diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-01-02 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2021-01-02 19:08:54 +0100 |
| commit | bd54cf960233c837d5053bc2220a9b4a50fcca73 (patch) | |
| tree | f3a2bca1143a56f3a6beaf2b2ddf2e2dc8aefd00 /pkgs | |
| parent | 29f7ba6fe3c10012c6c056bb54a8252d8e8c203b (diff) | |
| download | nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar.gz nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar.bz2 nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar.lz nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar.xz nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.tar.zst nixlib-bd54cf960233c837d5053bc2220a9b4a50fcca73.zip | |
paperwork: 2.0.1 -> 2.0.2
and cleanup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/paperwork/paperwork-gtk.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/office/paperwork/paperwork-shell.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/paperwork/src.nix | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index c493421dd11b..847287c8c856 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,8 +2,6 @@ , python3Packages , gtk3 , cairo -, aspellDicts -, buildEnv , gnome3 , librsvg , xvfb_run @@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec { make l10n_compile ''; - ASPELL_CONF = "dict-dir ${buildEnv { - name = "aspell-all-dicts"; - paths = lib.collect lib.isDerivation aspellDicts; - }}/lib/aspell"; - postInstall = '' # paperwork-shell needs to be re-wrapped with access to paperwork cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli # install desktop files and icons XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user + + # fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find + # resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path + # /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png. + site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk + for i in $site/data/paperwork_*.png; do + ln -s $i $site/icon/out; + done ''; checkInputs = [ xvfb_run dbus.daemon ]; diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 1be6f329e3cf..7e633f54f9e1 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -10,6 +10,7 @@ , paperwork-backend , fabulous , getkey +, psutil , pkgs }: @@ -34,6 +35,7 @@ buildPythonPackage rec { paperwork-backend fabulous getkey + psutil ]; checkInputs = [ diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 70770676edde..45c05cc4962e 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,12 +1,12 @@ {fetchFromGitLab}: rec { - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4"; + sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; }; } |