summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Biz/Bild.nix2
-rw-r--r--Biz/Bild/Deps.nix2
-rwxr-xr-xBiz/Ide/repl2
3 files changed, 4 insertions, 2 deletions
diff --git a/Biz/Bild.nix b/Biz/Bild.nix
index 1bc9083..5774950 100644
--- a/Biz/Bild.nix
+++ b/Biz/Bild.nix
@@ -45,7 +45,7 @@ rec {
bildRuntimeDeps = with nixpkgs; [
pkg-config
gnutls
- guile_3_0
+ guile
SDL
private.ghcPackageSetBild
rustc
diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 3947910..ce8362e 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -44,6 +44,8 @@ in rec
gnutls = super.gnutls.override { guileBindings = true; };
+ guile = super.guile_3_0;
+
guile-opengl = super.callPackage ./Deps/guile-opengl.nix {};
# The libfive build is broken...
#inspekt3d = super.callPackage ./Deps/inspekt3d.nix {};
diff --git a/Biz/Ide/repl b/Biz/Ide/repl
index c6259e1..3ed9fa1 100755
--- a/Biz/Ide/repl
+++ b/Biz/Ide/repl
@@ -50,7 +50,7 @@ fi
for lib in ${langdeps[@]}; do
flags+=(--packages "$BILD.private.nixpkgs.guile-${lib}")
done
- flags+=(--packages "$BILD.private.nixpkgs.guile_3_0")
+ flags+=(--packages "$BILD.private.nixpkgs.guile")
command=${CMD:-"guile -L ${BIZ_ROOT:?} -C ${BIZ_ROOT:?}/_/int --r7rs --listen=${PORT:-37146}"}
;;
Lisp)