cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #90537 from maralorn/fix-system-config-printer

Browse source 
system-config-printer: Fix ABRT: free(): invalid pointer
This commit is contained in:
Florian Klink 2020-06-16 00:23:47 +02:00 committed by GitHub
commit c09eb57e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/misc/system-config-printer/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook { stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
, docbook_xml_dtd_412, docbook_xsl , docbook_xml_dtd_412, docbook_xsl
, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
, gobject-introspection, libsecret, packagekit , gobject-introspection, libsecret, packagekit
@ -24,7 +24,20 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash
''; '';
patches = [ ./detect_serverbindir.patch ]; 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 = [ buildInputs = [
glib udev libusb1 cups glib udev libusb1 cups