From 57f9cc103f1e62ee1b27e73051d78f2acf2bce17 Mon Sep 17 00:00:00 2001 From: Tom Kirchner Date: Sat, 30 Mar 2024 17:09:36 -0700 Subject: [PATCH] ptouch-print: 1.4.3 -> 1.5-unstable-2024-02-11 The old upstream homepage and repo are dead; this moves them to the new home. The latest release version is 1.5, but that does not contain several important commits, including support for Brother's latest "standard" label makers, so this moves to the latest commit. Log here: https://git.familie-radermacher.ch/linux/ptouch-print.git/log/ See original effort to update to 1.5 here; most of the changes are from this original PR: https://github.com/NixOS/nixpkgs/pull/197981 --- pkgs/misc/ptouch-print/default.nix | 40 +++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/misc/ptouch-print/default.nix index da0d3c8c97d3..e8c51514e0a9 100644 --- a/pkgs/misc/ptouch-print/default.nix +++ b/pkgs/misc/ptouch-print/default.nix @@ -1,35 +1,57 @@ -{ lib, stdenv +{ cmake , fetchgit -, autoreconfHook , gd +, gettext +, git +, lib +, libjpeg +, libpng , libusb1 +, pkg-config +, stdenv +, zlib }: stdenv.mkDerivation rec { pname = "ptouch-print"; - version = "1.4.3"; + version = "1.5-unstable-2024-02-11"; src = fetchgit { - url = "https://mockmoon-cybernetics.ch/cgi/cgit/linux/ptouch-print.git"; - rev = "v${version}"; - sha256 = "0i57asg2hj1nfwy5lcb0vhrpvb9dqfhf81vh4i929h1kiqhlw2hx"; + url = "https://git.familie-radermacher.ch/linux/ptouch-print.git"; + rev = "8aaeecd84b619587dc3885dd4fea4b7310c82fd4"; + hash = "sha256-IIq3SmMfsgwSYbgG1w/wrBnFtb6xdFK2lkK27Qqk6mw="; }; nativeBuildInputs = [ - autoreconfHook + cmake + git + pkg-config ]; buildInputs = [ gd + gettext + libjpeg + libpng + zlib libusb1 ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv ptouch-print $out/bin + + runHook postInstall + ''; + meta = with lib; { description = "Command line tool to print labels on Brother P-Touch printers on Linux"; + homepage = "https://dominic.familie-radermacher.ch/projekte/ptouch-print/"; license = licenses.gpl3Plus; - homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/"; + mainProgram = "ptouch-print"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; - mainProgram = "ptouch-print"; }; }