ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pkgs: diff-flake: substitute 'mktemp'

Browse source
This commit is contained in:
Bruno BELANYI 2021-04-25 12:46:44 +00:00
parent 37a134ebd2
commit f817b278fe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/diff-flake/default.nix
View file

@ -23,6 +23,7 @@ stdenvNoCC.mkDerivation {
''; '';
cat = "${coreutils}/bin/cat"; cat = "${coreutils}/bin/cat";
mktemp = "${coreutils}/bin/mktemp";
git = "${git}/bin/git"; git = "${git}/bin/git";
sed = "${gnused}/bin/sed"; sed = "${gnused}/bin/sed";

4
pkgs/diff-flake/diff-flake
View file

@ -98,8 +98,8 @@ fill_default_outputs() {
diff_output() { diff_output() {
local PREV NEW; local PREV NEW;
PREV="$(mktemp --dry-run)" PREV="$(@mktemp@ --dry-run)"
NEW="$(mktemp --dry-run)" NEW="$(@mktemp@ --dry-run)"
nix build "${NIX_BUILD_ARGS[@]}" -v ".?rev=${PREVIOUS_REV}#$1" -o "$PREV" nix build "${NIX_BUILD_ARGS[@]}" -v ".?rev=${PREVIOUS_REV}#$1" -o "$PREV"
nix build "${NIX_BUILD_ARGS[@]}" -v ".${NEW_REV:+?rev=$NEW_REV}#$1" -o "$NEW" nix build "${NIX_BUILD_ARGS[@]}" -v ".${NEW_REV:+?rev=$NEW_REV}#$1" -o "$NEW"