From d2c00b8c849eb93f103ba07b4a44034bb4d0c933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 2 Jan 2023 11:35:39 +0100 Subject: [PATCH] fix build of devShell --- shell.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/shell.nix b/shell.nix index f64215e..a4bda27 100644 --- a/shell.nix +++ b/shell.nix @@ -16,16 +16,13 @@ let inherit (pkgs) lib stdenv; - + nix-eval-jobs = pkgs.callPackage ./default.nix { + inherit srcDir nix; + }; in -(pkgs.callPackage ./default.nix { - inherit srcDir nix; -}).overrideAttrs (old: { - - src = null; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - +pkgs.mkShell { + inherit (nix-eval-jobs) buildInputs; + nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [ pkgs.treefmt pkgs.llvmPackages.clang # clang-format pkgs.nixpkgs-fmt @@ -37,10 +34,9 @@ in ])) ]; - NODE_PATH = "${pkgs.nodePackages.prettier-plugin-toml}/lib/node_modules"; shellHook = lib.optionalString stdenv.isLinux '' export NIX_DEBUG_INFO_DIRS="${pkgs.curl.debug}/lib/debug:${nix.debug}/lib/debug''${NIX_DEBUG_INFO_DIRS:+:$NIX_DEBUG_INFO_DIRS}" ''; -}) +}