From c4810e7035377dd15588a58540edd4e6d1efa676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cain=C3=A3=20Costa?= Date: Thu, 27 Jul 2023 10:08:12 -0300 Subject: [PATCH] fix: use pure mkShell for devShell For some reason, having mkShell with the interface they used makes the environment not consistent. This changes fixes it. --- flake.nix | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index b60f542a..7b07f15a 100644 --- a/flake.nix +++ b/flake.nix @@ -63,30 +63,22 @@ overlays.default = final: prev: { aiken = packages.aiken; }; - aikenCmds = commonCategory "Aiken Development" [{ - name = "aiken"; - help = "Aiken toolchain"; - package = packages.aiken; - }]; - gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty"; in { inherit packages overlays; - devShells.aiken = pkgs.mkShell { - name = "aiken"; - motd = '' - Aiken - $(type -p menu &>/dev/null && menu)''; - commands = aikenCmds; + devShell = pkgs.mkShell { + buildInputs = with pkgs; + [ + deno - packages = [ - deno + pkg-config + openssl - (pkgs.rust-bin.stable.latest.default.override { - extensions = [ "rust-src" "clippy" "rustfmt" ]; - }) - ] ++ osxDependencies; + (pkgs.rust-bin.stable.latest.default.override { + extensions = [ "rust-src" "clippy" "rustfmt" ]; + }) + ] ++ osxDependencies; shellHook = '' export GIT_REVISION=${gitRev}