Merge pull request #295023 from ChlorideCull/lprint-2

Add lprint, update pappl
This commit is contained in:
Guillaume Girol 2024-03-13 21:22:11 +01:00 committed by GitHub
commit b5b4888cae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 52 additions and 11 deletions

View File

@ -3452,6 +3452,12 @@
githubId = 1118859;
name = "Scott Worley";
};
ChlorideCull = {
email = "nixrelated@chcl.se";
github = "ChlorideCull";
githubId = 4977063;
name = "Sebastian Johansson";
};
choochootrain = {
email = "hurshal@imap.cc";
github = "choochootrain";

View File

@ -13,23 +13,15 @@
stdenv.mkDerivation rec {
pname = "pappl";
version = "1.1.0";
version = "1.4.6";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0=";
sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE=";
};
patches = [
(fetchpatch {
name = "file-offset-bits-64-linux.patch";
url = "https://github.com/michaelrsweet/pappl/commit/7ec4ce4331b6637c54a37943269e05d15ff6dd47.patch";
sha256 = "sha256-x5lriopWw6Mn2qjv19flsleEzPMHU4jYWRy0y6hTL5k=";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
@ -66,6 +58,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/michaelrsweet/pappl";
license = licenses.asl20;
platforms = platforms.linux; # should also work for darwin, but requires additional work
maintainers = with maintainers; [ jonringer ];
maintainers = with maintainers; [ jonringer ChlorideCull ];
};
}

View File

@ -0,0 +1,43 @@
{ lib, stdenv, fetchFromGitHub
, pappl
, cups
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "lprint";
version = "1.3.1";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
pappl
cups
];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/lprint --help
'';
enableParallelBuilding = true;
meta = with lib; {
description = "LPrint implements printing for a variety of common label and receipt printers connected via network or USB.";
homepage = "https://github.com/michaelrsweet/lprint";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ ChlorideCull ];
};
}