wip

input-output-hk · Aug 23, 2023 · 13d7800 · 13d7800
1 parent 51ca18c
commit 13d7800
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -15,6 +15,8 @@
       url = "github:nix-community/npmlock2nix";
       flake = false;
     };
+
+    std.url = "github:divnix/std";
   };
 
 

diff --git a/nix/ci.nix b/nix/ci.nix
@@ -7,5 +7,6 @@
   includedPaths = lib.optionals pkgs.stdenv.hostPlatform.isLinux [
     "oci-images"
     "operables"
+    "playwright"
   ];
 }
diff --git a/nix/marlowe-playground/oci-images.nix b/nix/marlowe-playground/oci-images.nix
@@ -1,6 +1,6 @@
 { inputs', pkgs, lib, ... }:
 let
-  inherit (inputs.std.lib.ops) mkStandardOCI;
+  inherit (inputs'.std.lib.ops) mkStandardOCI;
 
   mkImage = { name, description }:
     mkStandardOCI {

diff --git a/nix/per-system-outputs.nix b/nix/per-system-outputs.nix
@@ -1,17 +1,17 @@
 # This file is part of the IOGX template and is documented at the link below:
 # https://www.github.com/input-output-hk/iogx#35-nixper-system-outputsnix
 
-{ repoRoot, haskellProjects, ... }:
+{ repoRoot, haskellProjects, system, lib, ... }:
 
 {
   packages.generated-purescript = repoRoot.nix.marlowe-playground.generated-purescript;
 
   packages.marlowe-playground-client = repoRoot.nix.marlowe-playground.marlowe-playground-client;
 
-  packages.playwright = repoRoot.nix.marlowe-playground.playwright;
-
   packages.ghc-with-marlowe = haskellProjects.default.ghcWithPackages (pkgs: [ pkgs.marlowe-cardano ]);
 
+  playwright = lib.optionalAttrs (system == "x86_64-linux") repoRoot.nix.marlowe-playground.playwright;
+
   operables = repoRoot.nix.marlowe-playground.operables haskellProjects.default;
 
   oci-images = repoRoot.nix.marlowe-playground.oci-images;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ @@
           url = "github:nix-community/npmlock2nix";
           flake = false;
         };
+        std.url = "github:divnix/std";
       };
@@ Expand Down @@