From 73f6bc2c4e0b3dbcd82017a4394926121c67a8ee Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:11:36 +0100 Subject: [PATCH] pdf-sign: fix version name, simplify installPhase, move to pkgs/by-name --- .../pd/pdf-sign/package.nix} | 18 +++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 13 deletions(-) rename pkgs/{tools/graphics/pdf-sign/default.nix => by-name/pd/pdf-sign/package.nix} (65%) diff --git a/pkgs/tools/graphics/pdf-sign/default.nix b/pkgs/by-name/pd/pdf-sign/package.nix similarity index 65% rename from pkgs/tools/graphics/pdf-sign/default.nix rename to pkgs/by-name/pd/pdf-sign/package.nix index 32e6a0371a54..8dd23f5f76d7 100644 --- a/pkgs/tools/graphics/pdf-sign/default.nix +++ b/pkgs/by-name/pd/pdf-sign/package.nix @@ -10,12 +10,12 @@ }: let - python-env = python3.withPackages (ps: with ps; [ tkinter ]); + python = python3.withPackages (ps: with ps; [ tkinter ]); binPath = lib.makeBinPath [ ghostscript pdftk poppler_utils ]; in stdenv.mkDerivation { pname = "pdf-sign"; - version = "unstable-2023-08-08"; + version = "0-unstable-2023-08-08"; src = fetchFromGitHub { owner = "svenssonaxel"; @@ -26,18 +26,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeBinaryWrapper ]; + buildInputs = [ python ]; + installPhase = '' runHook preInstall - mkdir -p $out - cp pdf-sign pdf-create-empty $out - - makeWrapper ${python-env}/bin/python $out/bin/pdf-sign \ - --add-flags $out/pdf-sign \ - --prefix PATH : ${binPath} - makeWrapper ${python-env}/bin/python $out/bin/pdf-create-empty \ - --add-flags $out/pdf-create-empty \ - --prefix PATH : ${binPath} + install -Dm755 pdf-sign pdf-create-empty -t $out/bin + wrapProgram $out/bin/pdf-sign --prefix PATH : ${binPath} + wrapProgram $out/bin/pdf-create-empty --prefix PATH : ${binPath} runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 701ca27a7e13..cfcc4b3b33a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11970,8 +11970,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdf-sign = callPackage ../tools/graphics/pdf-sign { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; briss = callPackage ../tools/graphics/briss { };