From 8e10afac963935457348644f67a4b7eb3166185c Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 18 Apr 2019 14:51:18 +0800
Subject: [PATCH] windows: fix nix escaping and conda env name

---
 artiq/windows/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix
index 2e37569..439d95b 100644
--- a/artiq/windows/default.nix
+++ b/artiq/windows/default.nix
@@ -17,7 +17,7 @@ let
   # Double-escape because we produce a script from a shell heredoc
   ssh = cmd: qemu.ssh (escape cmd);
   scp = qemu.scp;
-  condaEnv = "artiq";
+  condaEnv = "artiq-env";
 in
 
 stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       "-boot" "order=c"
       "-snapshot"
       "-drive" "file=${diskImage},index=0,media=disk,cache=unsafe"
-      "-rtc" "base=$CLOCK"
+      "-rtc" "base=\\$CLOCK"
       "-display" "none"
     ]} &
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     sleep 10
     ${ssh "ver"}
     for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do
-      ${scp "\$pkg" "artiq.tar.bz2"}
+      ${scp "\\$pkg" "artiq.tar.bz2"}
       ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"}
     done