Merge pull request #21 from zmrocze/superdirt-install

Fix typo: superdirt-install now in devshell

Author: mitchmindtree

flake.nix

@@ -108,8 +108,8 @@
       };
 
       # Installs SuperDirt under your user's supercollider quarks.
-      superdirt-install = pkgs.writeShellScriptBin "superdirt-start" ''
-        ${supercollider}/bin/sclang ${superdirt}/install.sc
+      superdirt-install = pkgs.writeShellScriptBin "superdirt-install" ''
+        ${supercollider}/bin/sclang ${superdirt}/install.scd
       '';
 
       # Run the tidal interpreter (ghci running BootTidal.hs).
@@ -161,7 +161,7 @@
       tidal = final: prev: let
         tidalpkgs = mkPackages prev;
       in {
-        inherit (tidalpkgs) superdirt-start superdirt-install tidal;
+        inherit (tidalpkgs) superdirt-start superdirt-install tidal sclang-with-superdirt;
         vimPlugins = prev.vimPlugins // {inherit (tidalpkgs) vim-tidal;};
       };
       default = tidal;
@@ -174,7 +174,9 @@
         buildInputs = [
           tidalpkgs.supercollider
           tidalpkgs.superdirt-start
+          tidalpkgs.superdirt-install
           tidalpkgs.tidal
+          tidalpkgs.sclang-with-superdirt
         ];
         # Convenient access to a config providing all quarks required for Tidal.
         SUPERDIRT_SCLANG_CONF = "${tidalpkgs.superdirt}/sclang_conf.yaml";

quark/lib.nix

@@ -9,7 +9,7 @@
   # The resulting quark contains:
   # - `quark` subdirectory, containing the quark itself along with symbolic
   # links to each of its dependencies.
-  # - a `install.sc` file that can be used to install the Quark imperatively.
+  # - a `install.scd` file that can be used to install the Quark imperatively.
   # - a `sclang_conf.yaml` that can be used to provide the quark and its
   # dependencies directly to an interpreter.
   #
@@ -33,10 +33,10 @@
 
         # Write a `sc` file that can be used to install the quark imperatively.
         # TODO: Don't clear all quarks - only remove any with matching ${name}.
-        install-sc = ''
+        install-scd = ''
           Quarks.clear;
           Quarks.install(\"$out\");
-          thisProcess.recompile();\
+          thisProcess.recompile();
         '';
 
         # Write a yaml config file with an entry for this quark.
@@ -52,7 +52,7 @@
         mkdir -p $out/quark/${name}
         cp -r ./* $out/quark/${name}
         ${ln-deps}
-        echo "${install-sc}" >> $out/install.sc
+        echo "${install-scd}" >> $out/install.scd
         echo "${sclang-conf-yaml}" >> $out/sclang_conf.yaml
       '';
     };