summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2021-02-09 18:37:50 -0500
committerBen Sima <ben@bsima.me>2021-02-09 18:37:50 -0500
commitdb27065bf4494794192fcf362b9b026b6525df3b (patch)
tree901929c84b4fecdd174bcadca4abfd91d6ac4544
parentd264355fcfbed439157eb7ce9371776806bc2253 (diff)
Fix nix-shell on darwin
-rw-r--r--Biz/Bild/Deps/guile-opengl.nix2
-rw-r--r--Biz/Bild/Deps/inspekt3d.nix2
-rw-r--r--Biz/Bild/Rules.nix13
3 files changed, 9 insertions, 8 deletions
diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Biz/Bild/Deps/guile-opengl.nix
index 6b5df43..d334430 100644
--- a/Biz/Bild/Deps/guile-opengl.nix
+++ b/Biz/Bild/Deps/guile-opengl.nix
@@ -34,6 +34,6 @@ in stdenv.mkDerivation {
homepage = "https://www.gnu.org/software/guile-opengl/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix
index f891ca3..2d76b0d 100644
--- a/Biz/Bild/Deps/inspekt3d.nix
+++ b/Biz/Bild/Deps/inspekt3d.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
homepage = "https://gitlab.com/kavalogic-inc/inspekt3d";
license = licenses.gpl3;
maintainers = with maintainers; [ bsima ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix
index c18c56e..4875455 100644
--- a/Biz/Bild/Rules.nix
+++ b/Biz/Bild/Rules.nix
@@ -131,17 +131,11 @@ in rec {
ghcjs-base
]))
- # scheme deps
- nixpkgs.guile
- nixpkgs.inspekt3d
- nixpkgs.libfive
-
# python deps
(nixpkgs.python38.withPackages (p:
[ p.black p.pylint ]))
# tools
- nixpkgs.ccze
nixpkgs.cmark
nixpkgs.figlet
nixpkgs.haskell.packages.${ghcCompiler}.fast-tags
@@ -155,6 +149,13 @@ in rec {
nixpkgs.shellcheck
nixpkgs.wemux
(pkgs.writeScriptBin "ftags" (builtins.readFile ../Ide/ftags.sh))
+ ] ++ lib.optional nixpkgs.stdenv.isLinux [
+ # scheme deps (i think these are broken on macOS)
+ nixpkgs.guile
+ nixpkgs.inspekt3d
+ nixpkgs.libfive
+
+ nixpkgs.ccze
];
shellHook = ". ${./ShellHook.sh}";
};