From 2e5597d571948911ed00e664752beebea4d5f6dc Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 24 May 2023 15:45:00 +0200 Subject: [PATCH] makeself: use installManPage --- pkgs/applications/misc/makeself/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index bd197395e851..3226797ca4be 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2 }: +{ lib, stdenv, fetchFromGitHub, which, zstd, pbzip2, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.5"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; }; + nativeBuildInputs = [ installShellFiles ]; + postPatch = "patchShebangs test"; # Issue #110149: our default /bin/sh apparently has 32-bit math only @@ -22,11 +24,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ which zstd pbzip2 ]; installPhase = '' - mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} - cp makeself.lsm README.md $out/share/${pname}-${version} - cp makeself.sh $out/bin/makeself - cp makeself.1 $out/share/man/man1/ - cp makeself-header.sh $out/share/${pname}-${version} + runHook preInstall + installManPage makeself.1 + install -Dm555 makeself.sh $out/bin/makeself + install -Dm444 -t $out/share/${pname}/ makeself.lsm README.md makeself-header.sh + runHook postInstall ''; fixupPhase = ''