diff options
author | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-07-21 23:01:47 +0200 |
---|---|---|
committer | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-07-21 23:01:47 +0200 |
commit | ecdf23ed094a0b10c87cae8270d7c1a298d537b2 (patch) | |
tree | 347c215a3cc47db7995ef7671e277c651c634974 /pkgs/tools/misc/system-config-printer | |
parent | 1779e6fa8ff497c34c515477970ee5bfcf018fe9 (diff) | |
download | nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar.gz nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar.bz2 nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar.lz nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar.xz nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.tar.zst nixpkgs-ecdf23ed094a0b10c87cae8270d7c1a298d537b2.zip |
system-config-printer: 1.5.12 -> 1.5.15
Diffstat (limited to 'pkgs/tools/misc/system-config-printer')
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 1781187481f..aafdfe07ff9 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.12"; + version = "1.5.15"; src = fetchFromGitHub { owner = "openPrinting"; repo = pname; - rev = version; - sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf"; + rev = "v${version}"; + sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc"; }; prePatch = '' @@ -26,17 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 - # (Fixes will be included in next upstream release.) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; - sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; - }) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; - sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; - }) ]; buildInputs = [ @@ -55,6 +44,10 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + preConfigure = '' + intltoolize --copy --force --automake + ''; + configureFlags = [ "--with-udev-rules" "--with-udevdir=${placeholder "out"}/etc/udev" |