Change README to use mkBuildProjectOutput

justinwoo · Sep 1, 2019 · c4aad22 · c4aad22
1 parent d736270
commit c4aad22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -55,10 +55,15 @@ let
 in
 pkgs.stdenv.mkDerivation rec {
   # < ... >
+  src = ./.;
+
+  buildInputs = [ spagoPackages.installSpagoStyle ];
+
   buildPhase = 
   '' 
-    ${spagoPkgs.installSpagoStyle} # == spago2nix install
-    ${spagoPkgs.buildSpagoStyle}   # == spago2nix build
+    installSpagoStyle # == spago2nix install
+
+    ${spagoPackages.mkBuildProjectOutput { inherit src purescript; }}
   '';
   # < ... >
 }

diff --git a/src/Generate.purs b/src/Generate.purs
@@ -154,20 +154,20 @@ in {
   '';
 
   buildSpagoStyle = pkgs.writeShellScriptBin "build-spago-style" ''
-    EXTRA_FILES=$@
+    EXTRA_FILES="$@"
 
     echo "echo building project..."
     echo "purs compile ${builtins.toString (
-      builtins.map getGlob (builtins.attrValues inputs))}" \"\$EXTRA_FILES\"
+      builtins.map getGlob (builtins.attrValues inputs))}" \$EXTRA_FILES
     echo "echo done."
   '';
 
   buildFromNixStore = pkgs.writeShellScriptBin "build-from-store" ''
-    EXTRA_FILES=$@
+    EXTRA_FILES="$@"
 
     echo "echo building project using sources from nix store..."
     echo "purs compile ${builtins.toString (
-      builtins.map getStoreGlob (builtins.attrValues inputs))}" \"\$EXTRA_FILES\"
+      builtins.map getStoreGlob (builtins.attrValues inputs))}" \$EXTRA_FILES
     echo "echo done."
   '';