From fd8ab54324450671c5de41177e776045b732b7ec Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Apr 2024 21:02:16 +0200 Subject: [PATCH] git-annex: don't use redundant installation targets `make install` also implies install-mans and install-completions. --- pkgs/development/haskell-modules/configuration-nix.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a3739ad96210..660bf2d123c6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -776,7 +776,7 @@ self: super: builtins.intersectAttrs super { # the environment variables it uses via the preInstall hook since the Haskell # generic builder doesn't accept them as arguments. preInstall = drv.preInstall or "" + '' - installTargets="install install-completions" + installTargets="install" installFlagsArray+=( "BUILDER=:" "PREFIX=" @@ -801,13 +801,6 @@ self: super: builtins.intersectAttrs super { # `git-annex-shell` by making `shell = haskellPackages.git-annex`. # https://git-annex.branchable.com/git-annex-shell/ passthru.shellPath = "/bin/git-annex-shell"; - - # Install man pages which is no longer done by Setup.hs - # TODO(@sternenseemann): figure out why install-desktops wants to create /usr - # and run that, too. - postInstall = drv.postInstall or "" + '' - make install-mans "DESTDIR=$out" PREFIX= - ''; }) (super.git-annex.override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;