public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108247 from symphorien/paperwork-next

Browse Source
This commit is contained in:
Sandro 2021-01-04 16:41:05 +01:00 committed by GitHub
commit 06c9dbcece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/paperwork/paperwork-gtk.nix
View File

@ -2,8 +2,6 @@
, python3Packages , python3Packages
, gtk3 , gtk3
, cairo , cairo
, aspellDicts
, buildEnv
, gnome3 , gnome3
, librsvg , librsvg
, xvfb_run , xvfb_run
@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec {
make l10n_compile make l10n_compile
''; '';
ASPELL_CONF = "dict-dir ${buildEnv {
name = "aspell-all-dicts";
paths = lib.collect lib.isDerivation aspellDicts;
}}/lib/aspell";
postInstall = '' postInstall = ''
# paperwork-shell needs to be re-wrapped with access to paperwork # paperwork-shell needs to be re-wrapped with access to paperwork
cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli
# install desktop files and icons # install desktop files and icons
XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user 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 ]; checkInputs = [ xvfb_run dbus.daemon ];

2
pkgs/applications/office/paperwork/paperwork-shell.nix
View File

@ -10,6 +10,7 @@
, paperwork-backend , paperwork-backend
, fabulous , fabulous
, getkey , getkey
, psutil
, pkgs , pkgs
}: }:
@ -34,6 +35,7 @@ buildPythonPackage rec {
paperwork-backend paperwork-backend
fabulous fabulous
getkey getkey
psutil
]; ];
checkInputs = [ checkInputs = [

4
pkgs/applications/office/paperwork/src.nix
View File

@ -1,12 +1,12 @@
{fetchFromGitLab}: {fetchFromGitLab}:
rec { rec {
version = "2.0.1"; version = "2.0.2";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
repo = "paperwork"; repo = "paperwork";
group = "World"; group = "World";
owner = "OpenPaperwork"; owner = "OpenPaperwork";
rev = version; rev = version;
sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4"; sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly";
}; };
} }

4
pkgs/development/libraries/libinsane/default.nix
View File

@ -17,7 +17,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libinsane"; pname = "libinsane";
version = "1.0.8"; version = "1.0.9";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
group = "World"; group = "World";
owner = "OpenPaperwork"; owner = "OpenPaperwork";
rev = version; rev = version;
sha256 = "0mcvqpixilzs4d4afkbxa1nqm6ddmhpaz5j56pfvc5wpv6s99h44"; sha256 = "1a1lszhq3j11i1jybc5kmn7hhhji44xhjqsxsldsy9l3344rkzv4";
}; };
nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];