From 30f205680f6570958041b93a766d12edd50b6313 Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Fri, 26 Jun 2020 20:45:26 +0200
Subject: [PATCH] wfvm: add RESTRICTDIST- to names of nonfree output paths

Preparation for https://git.m-labs.hk/M-Labs/nix-scripts/issues/26
---
 artiq-fast/wfvm/layers/default.nix | 1 +
 artiq-fast/wfvm/win.nix            | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/artiq-fast/wfvm/layers/default.nix b/artiq-fast/wfvm/layers/default.nix
index 98bda4f..c3f42bc 100644
--- a/artiq-fast/wfvm/layers/default.nix
+++ b/artiq-fast/wfvm/layers/default.nix
@@ -71,6 +71,7 @@ in
     name = "MSVC";
     script = let
       bootstrapper = pkgs.fetchurl {
+        name = "RESTRICTDIST-vs_Community.exe";
         url = "https://download.visualstudio.microsoft.com/download/pr/ac05c4f5-0da1-429f-8701-ce509ac69926/cc9556137c66a373670376d6db2fc5c5c937b2b0bf7b3d3cac11c69e33615511/vs_Community.exe";
         sha256 = "04amc4rrxihimhy3syxzn2r3gjf5qlpxpmkn0dkp78v6gh9md5fc";
       };
diff --git a/artiq-fast/wfvm/win.nix b/artiq-fast/wfvm/win.nix
index 789e3b0..7f9376d 100644
--- a/artiq-fast/wfvm/win.nix
+++ b/artiq-fast/wfvm/win.nix
@@ -33,6 +33,7 @@ let
   );
 
   windowsIso = if windowsImage != null then windowsImage else pkgs.fetchurl {
+    name = "RESTRICTDIST-release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
     url = "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
     sha256 = "668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a";
   };
@@ -116,12 +117,12 @@ let
       ''
   );
 
-  baseImage = pkgs.runCommandNoCC "windows.img" {} ''
+  baseImage = pkgs.runCommandNoCC "RESTRICTDIST-windows.img" {} ''
     ${installScript}
     mv c.img $out
   '';
 
-  finalImage = builtins.foldl' (acc: v: pkgs.runCommandNoCC "${v.name}.img" {
+  finalImage = builtins.foldl' (acc: v: pkgs.runCommandNoCC "RESTRICTDIST-${v.name}.img" {
     buildInputs = with utils; [
       qemu win-wait win-exec win-put
     ] ++ (v.buildInputs or []);