b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #234454 from figsoda/bin

Browse source
This commit is contained in:
figsoda 2023-05-29 11:47:11 -04:00 committed by GitHub
parent f89d84ae5e 4b94ae4bc6
commit c82114ce5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/build-support/trivial-builders/default.nix
View file

@ -135,9 +135,15 @@ rec {
, allowSubstitutes ? false
, preferLocalBuild ? true
}:
let
matches = builtins.match "/bin/([^/]+)" destination;
in
runCommand name
{ inherit text executable checkPhase meta allowSubstitutes preferLocalBuild;
{ inherit text executable checkPhase allowSubstitutes preferLocalBuild;
passAsFile = [ "text" ];
meta = lib.optionalAttrs (executable && matches != null) {
mainProgram = lib.head matches;
} // meta;
}
''
target=$out${lib.escapeShellArg destination}
@ -230,7 +236,7 @@ rec {
*/
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}"; meta.mainProgram = name;};
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
/*
Similar to writeScript. Writes a Shell script and checks its syntax.
@ -288,7 +294,6 @@ rec {
checkPhase = ''
${stdenv.shellDryRun} "$target"
'';
meta.mainProgram = name;
};
/*
@ -351,8 +356,6 @@ rec {
runHook postCheck
''
else checkPhase;
meta.mainProgram = name;
};
# Create a C binary