From 917524cb3908b5010e5804b32a8b2ef2cd3bfccd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 4 May 2021 11:38:46 +0200 Subject: [PATCH] pinboard-notes-backup: justStaticExecutables, move overrides Should reduce closure size and reduce the difference between top-level and haskellPackages version of pinboard-notes-backup. --- pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3f0e2145394..b6bfb78771d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -848,4 +848,13 @@ self: super: builtins.intersectAttrs super { export PATH=dist/build/stutter:$PATH '' + (drv.preCheck or ""); }); + + # Install man page and generate shell completions + pinboard-notes-backup = overrideCabal + (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup) + (drv: { + postInstall = '' + install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 + '' + (drv.postInstall or ""); + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f426a8a84f8..e7715c6cda5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23793,14 +23793,7 @@ in pinboard = with python3Packages; toPythonApplication pinboard; - pinboard-notes-backup = haskell.lib.overrideCabal - (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" - haskellPackages.pinboard-notes-backup) - (drv: { - postInstall = '' - install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 - '' + (drv.postInstall or ""); - }); + pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup; pixelnuke = callPackage ../applications/graphics/pixelnuke { };