From 3d07ae8afd3e6ccb2f95e42d898e2eaa271d6f9e Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 18 Aug 2022 13:49:45 -0600 Subject: [PATCH] build-dotnet-module: Allow specifying the output path of fetch-deps --- 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 62820e8d47ee..bc50f1bd090c 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }: +{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeShellScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }: { name ? "${args.pname}-${args.version}" , pname ? name @@ -136,14 +136,14 @@ in stdenvNoCC.mkDerivation (args // { fetch-deps = let exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; }; - in writeScript "fetch-${pname}-deps" '' + in writeShellScript "fetch-${pname}-deps" '' set -euo pipefail export PATH="${lib.makeBinPath [ coreutils dotnet-sdk nuget-to-nix ]}" cd "$(dirname "''${BASH_SOURCE[0]}")" export HOME=$(mktemp -d) - deps_file="/tmp/${pname}-deps.nix" + deps_file="''${1:-/tmp/${pname}-deps.nix}" store_src="${srcOnly args}" src="$(mktemp -d /tmp/${pname}.XXX)"