diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 07a09fbfc0a..0881d6d06b5 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,19 +1,19 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv -, gnome3, hicolor_icon_theme +, gnome3, hicolor_icon_theme, librsvg , xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { name = "paperwork-${version}"; # Don't forget to also update paperwork-backend when updating this! - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { repo = "paperwork"; - owner = "jflesch"; + owner = "openpaperwork"; rev = version; - sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5"; + sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz"; }; # Patch out a few paths that assume that we're using the FHS: @@ -47,7 +47,9 @@ python3Packages.buildPythonApplication rec { }}/lib/aspell"; checkInputs = [ xvfb_run dbus.daemon ]; - buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ]; + buildInputs = [ + gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg + ]; # A few parts of chkdeps need to have a display and a dbus session, so we not # only need to run a virtual X server + dbus but also have a large enough @@ -64,6 +66,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" + "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\"" "--prefix XDG_DATA_DIRS : \"$out/share\"" "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\"" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9edff833f5..02e2bc3a56c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6520,13 +6520,13 @@ in { paperwork-backend = buildPythonPackage rec { name = "paperwork-backend-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = pkgs.fetchFromGitHub { - owner = "jflesch"; + owner = "openpaperwork"; repo = "paperwork-backend"; rev = version; - sha256 = "1pzyy14f9wzh9vwn855k1z48a8mbs73j1dk8730kdlcdkmn3l1ms"; + sha256 = "1lrawibm6jnykj1bkrl8196kcxrhndzp7r0brdrb4hs54gql7j5x"; }; # Python 2.x is not supported.