Skip to content

Fix typo: superdirt-install now in devshell #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mitchmindtree merged 5 commits into from
Aug 9, 2024
Merged

Fix typo: superdirt-install now in devshell #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63b7d9b
Fix typo: superdirt-install now in devshell
zmrocze Apr 26, 2024
c3fca7e
Attempt at install-src
zmrocze Apr 26, 2024
adcedb4
Add scland-with-superdirt
zmrocze Apr 29, 2024
1e06603
Revert the buggy change
zmrocze Apr 29, 2024
6de9359
Rename install.sc -> install.scd
zmrocze May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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;
Expand All @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions quark/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -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.
Expand All @@ -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
'';
};
Expand Down