Merge pull request #125015 from NixOS/backport-94881-to-release-21.05
[Backport release-21.05] mblaze: fix mcom to use file utility.
This commit is contained in:
commit
3018bf4b9e
@ -1,10 +1,12 @@
|
|||||||
{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }:
|
{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused
|
||||||
|
, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mblaze";
|
pname = "mblaze";
|
||||||
version = "1.1";
|
version = "1.1";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
@ -22,6 +24,24 @@ stdenv.mkDerivation rec {
|
|||||||
installShellCompletion contrib/_mblaze
|
installShellCompletion contrib/_mblaze
|
||||||
'' + lib.optionalString (ruby != null) ''
|
'' + lib.optionalString (ruby != null) ''
|
||||||
install -Dt $out/bin contrib/msuck contrib/mblow
|
install -Dt $out/bin contrib/msuck contrib/mblow
|
||||||
|
|
||||||
|
# The following wrappings are used to preserve the executable
|
||||||
|
# names (the value of $0 in a script). The script mcom is
|
||||||
|
# designed to be run directly or via symlinks such as mrep. Using
|
||||||
|
# symlinks changes the value of $0 in the script, and makes it
|
||||||
|
# behave differently. When using the wrapProgram tool, the resulting
|
||||||
|
# wrapper breaks this behaviour. The following wrappers preserve it.
|
||||||
|
|
||||||
|
mkdir -p $out/wrapped
|
||||||
|
for x in mcom mbnc mfwd mrep; do
|
||||||
|
mv $out/bin/$x $out/wrapped
|
||||||
|
makeWrapper $out/wrapped/$x $out/bin/$x \
|
||||||
|
--argv0 $out/bin/$x \
|
||||||
|
--prefix PATH : $out/bin \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [
|
||||||
|
coreutils file gawk gnugrep gnused
|
||||||
|
]}
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user