From e97ee029b4243456f166398b08f6ec3b5b6c1946 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 16 Sep 2022 09:18:22 -0700 Subject: [PATCH] build-dotnet-module/fetch-deps: fixup temp naming when pname has a capital X in it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example, this script doesn't work for `xivlauncher` because its proper `pname` is `XIVLauncher`, and `mktemp` complains about "too few X's": $ mktemp -td "XXXXXX-XIVLauncher-home" mktemp: too few X's in template ‘XXXXXX-XIVLauncher-home’ vs $ mktemp -td "XIVLauncher-home-XXXXXX" /tmp/XIVLauncher-home-EdGMei --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 2a166089baed..470d2d47ff94 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -180,12 +180,12 @@ in stdenvNoCC.mkDerivation (args // { ;; esac - deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")" - export HOME=$(mktemp -td "XXXXXX-${pname}-home") + deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")" + export HOME=$(mktemp -td "${pname}-home-XXXXXX") mkdir -p "$HOME/nuget_pkgs" store_src="${srcOnly args}" - src="$(mktemp -td "XXXXXX-${pname}-src")" + src="$(mktemp -td "${pname}-src-XXXXXX")" cp -rT "$store_src" "$src" chmod -R +w "$src" trap "rm -rf $src $HOME" EXIT