system-config-printer: refactor to by-name, switch to finalAttrs (#539397)

This commit is contained in:
Weijia Wang
2026-08-07 19:00:57 +00:00
committed by GitHub
5 changed files with 14 additions and 11 deletions

View File

@@ -9,7 +9,7 @@
wrapGAppsHook3,
docbook_xml_dtd_412,
docbook_xsl,
libxml2,
libxml2Python,
desktop-file-utils,
libusb1,
cups,
@@ -30,17 +30,24 @@
fetchpatch,
}:
stdenv.mkDerivation rec {
let
libxml2 = libxml2Python;
in
stdenv.mkDerivation (finalAttrs: {
pname = "system-config-printer";
version = "1.5.18";
src = fetchFromGitHub {
owner = "openPrinting";
repo = pname;
rev = "v${version}";
sha256 = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk=";
repo = "system-config-printer";
tag = "v${finalAttrs.version}";
hash = "sha256-l3HEnYycP56vZWREWkAyHmcFgtu09dy4Ds65u7eqNZk=";
};
strictDeps = true;
__structuredAttrs = true;
prePatch = ''
# for automake
touch README ChangeLog
@@ -53,7 +60,7 @@ stdenv.mkDerivation rec {
# fix typeerror, remove on next release
(fetchpatch {
url = "https://github.com/OpenPrinting/system-config-printer/commit/399b3334d6519639cfe7f1c0457e2475b8ee5230.patch";
sha256 = "sha256-JCdGmZk2vRn3X1BDxOJaY3Aw8dr0ODVzi0oY20ZWfRs=";
hash = "sha256-JCdGmZk2vRn3X1BDxOJaY3Aw8dr0ODVzi0oY20ZWfRs=";
excludes = [ "NEWS" ];
})
@@ -145,4 +152,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
};
}
})

View File

@@ -2923,10 +2923,6 @@ with pkgs;
subzerod = with python3Packages; toPythonApplication subzerod;
system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python;
};
tartube-yt-dlp = tartube.override {
youtube-dl = yt-dlp;
};