Merge pull request #183676 from raboof/inkcut-fixes
This commit is contained in:
commit
8d435fca5c
|
@ -1,4 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
|
, fetchpatch
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
|
@ -18,6 +19,28 @@ buildPythonApplication rec {
|
||||||
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
|
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# fix opening the extension on inkscape 1.2
|
||||||
|
# https://github.com/inkcut/inkcut/pull/340
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch";
|
||||||
|
hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4=";
|
||||||
|
})
|
||||||
|
# fix loading a document from stdin (as used from the extension)
|
||||||
|
# https://github.com/inkcut/inkcut/issues/341
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch";
|
||||||
|
hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo=";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
# fix distutils deprecation error
|
||||||
|
# https://github.com/inkcut/inkcut/pull/343
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch";
|
||||||
|
hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace inkcut/device/transports/printer/plugin.py \
|
substituteInPlace inkcut/device/transports/printer/plugin.py \
|
||||||
--replace ", 'lpr', " ", '${cups}/bin/lpr', "
|
--replace ", 'lpr', " ", '${cups}/bin/lpr', "
|
||||||
|
|
Loading…
Reference in a new issue