From 4666f1aa6a3bba1e7f756110a32b4c98a93f0ca5 Mon Sep 17 00:00:00 2001
From: Stephan Maka <sm@m-labs.hk>
Date: Tue, 2 Feb 2021 13:20:00 +0100
Subject: [PATCH] artiq-full: concatenate paths as paths not strings

fixes running with restrict-eval=true on Hydra
---
 artiq-full.nix             | 2 +-
 artiq-full/artiq-board.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/artiq-full.nix b/artiq-full.nix
index 5de005c..c769a1d 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -13,7 +13,7 @@ let
         );
       isStandalone = jsonFile:
         (builtins.fromJSON (
-          builtins.readFile "${sinaraSystemsSrc}/${jsonFile}"
+          builtins.readFile (<sinaraSystemsSrc> + "/${jsonFile}")
         )).base == "standalone";
     in
       map (builtins.replaceStrings [".json"] [""]) (
diff --git a/artiq-full/artiq-board.nix b/artiq-full/artiq-board.nix
index 5b37c17..b9cc20e 100644
--- a/artiq-full/artiq-board.nix
+++ b/artiq-full/artiq-board.nix
@@ -16,7 +16,7 @@ let
   cargoDeps = fetchcargo rec {
     name = "artiq-firmware-cargo-deps";
     src = "${artiqSrc}/artiq/firmware";
-    sha256 = (import "${artiqSrc}/artiq/firmware/cargosha256.nix");
+    sha256 = import (artiqSrc + "/artiq/firmware/cargosha256.nix");
   };
 
   cargoVendored = pkgs.stdenv.mkDerivation {