pyrox.dev
Merge pull request #247800 from symphorien/system-config-printer-update
system-config-printer: 1.5.15 -> 1.5.18
authored by Guillaume Girol and committed by GitHub 2aaf6cbf 008c18a7
+13
-11
pkgs/tools/misc/system-config-printer/default.nix
+13
-11
pkgs/tools/misc/system-config-printer/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook
1
+
{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook
2
2
, docbook_xml_dtd_412, docbook_xsl
3
3
, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
4
4
, gobject-introspection, libsecret, packagekit
5
-
, cups-filters
6
-
, python3Packages, autoreconfHook, bash
5
+
, cups-filters, gettext, libtool, autoconf-archive
6
+
, python3Packages, autoreconfHook, bash, fetchpatch
7
7
}:
8
8
9
9
stdenv.mkDerivation rec {
10
10
pname = "system-config-printer";
11
-
version = "1.5.15";
11
+
version = "1.5.18";
12
12
13
13
src = fetchFromGitHub {
14
14
owner = "openPrinting";
15
15
repo = pname;
16
16
rev = "v${version}";
17
-
sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc";
17
+
sha256 = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk=";
18
18
};
19
19
20
20
prePatch = ''
···
26
26
27
27
patches = [
28
28
./detect_serverbindir.patch
29
+
# fix typeerror, remove on next release
30
+
(fetchpatch {
31
+
url = "https://github.com/OpenPrinting/system-config-printer/commit/399b3334d6519639cfe7f1c0457e2475b8ee5230.patch";
32
+
sha256 = "sha256-JCdGmZk2vRn3X1BDxOJaY3Aw8dr0ODVzi0oY20ZWfRs=";
33
+
excludes = [ "NEWS" ];
34
+
})
29
35
];
30
36
31
37
buildInputs = [
···
36
42
];
37
43
38
44
nativeBuildInputs = [
39
-
intltool pkg-config
45
+
pkg-config gettext libtool autoconf-archive
40
46
xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
41
47
python3Packages.wrapPython
42
48
wrapGAppsHook autoreconfHook gobject-introspection
43
49
];
44
50
45
-
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
46
-
47
-
preConfigure = ''
48
-
intltoolize --copy --force --automake
49
-
'';
51
+
pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 pycairo pysmbc ];
50
52
51
53
configureFlags = [
52
54
"--with-udev-rules"