git.iko.soy/typeable/nixpkgs
on master help sign in
system-config-printer: Fix ABRT: free(): invalid pointer

Apply patches picked from upstream as done on debian. Will be included in next upstream release.

commitfcecf15dc4105663f1dec7d954249824d3e555e8 authorMalte Brandy <malte.brandy@maralorn.de> dateMon 15 Jun 2020, 23:48 (6 years ago) parentf1603aa
1 file changed+15−2
pkgs/tools/misc/system-config-printer/default.nix+15−2
pkgs/tools/misc/system-config-printer/default.nix+15−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
1+{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
22, docbook_xml_dtd_412, docbook_xsl
33, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
44, gobject-introspection, libsecret, packagekit
@@ -24,7 +24,20 @@ stdenv.mkDerivation rec {
2424 substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash
2525 '';
2626
27− patches = [ ./detect_serverbindir.patch ];
27+ patches = [
28+ ./detect_serverbindir.patch
29+
30+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104
31+ # (Fixes will be included in next upstream release.)
32+ (fetchpatch {
33+ url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch";
34+ sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n";
35+ })
36+ (fetchpatch {
37+ url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch";
38+ sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23";
39+ })
40+ ];
2841
2942 buildInputs = [
3043 glib udev libusb1 cups