Unverified Commit 2ff81790 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

pappl: update; modernize; format; move to by-name (#348908)

parents 6b6886a8 4e8643ac
Loading
Loading
Loading
Loading
+74 −0
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub
, avahi
, cups
, gnutls
, libjpeg
, libpng
, libusb1
, pkg-config
, withPAMSupport ? true, pam
, zlib
{
  lib,
  stdenv,
  fetchFromGitHub,
  avahi,
  cups,
  gnutls,
  libjpeg,
  libpng,
  libusb1,
  pkg-config,
  withPAMSupport ? true,
  pam,
  zlib,
}:

stdenv.mkDerivation rec {
  pname = "pappl";
  version = "1.4.6";
  version = "1.4.7";

  src = fetchFromGitHub {
    owner = "michaelrsweet";
    repo = pname;
    rev = "v${version}";
    sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE=";
    repo = "pappl";
    rev = "refs/tags/v${version}";
    hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ=";
  };

  outputs = [ "out" "dev" ];
  outputs = [
    "out"
    "dev"
  ];

  nativeBuildInputs = [
    pkg-config
  ];

  buildInputs = [
  buildInputs =
    [
      cups
      libjpeg
      libpng
      libusb1
      zlib
  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
      # upstream mentions these are not needed for Mac
      # see: https://github.com/michaelrsweet/pappl#requirements
      avahi
      gnutls
  ] ++ lib.optionals withPAMSupport [
    ]
    ++ lib.optionals withPAMSupport [
      pam
    ];

@@ -52,12 +62,13 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

  meta = with lib; {
  meta = {
    description = "C-based framework/library for developing CUPS Printer Applications";
    changelog = "https://github.com/michaelrsweet/pappl/blob/v${version}/CHANGES.md";
    mainProgram = "pappl-makeresheader";
    homepage = "https://github.com/michaelrsweet/pappl";
    license = licenses.asl20;
    platforms = platforms.linux; # should also work for darwin, but requires additional work
    maintainers = [ ];
    license = lib.licenses.asl20;
    platforms = lib.platforms.linux; # should also work for darwin, but requires additional work
    maintainers = [ lib.maintainers.NotAShelf ];
  };
}
+0 −2
Original line number Diff line number Diff line
@@ -10956,8 +10956,6 @@ with pkgs;
  papertrail = callPackage ../tools/text/papertrail { };
  pappl = callPackage ../applications/printing/pappl { };
  par2cmdline = callPackage ../tools/networking/par2cmdline { };
  parallel = callPackage ../tools/misc/parallel { };