fix build of devShell

This commit is contained in:
Jörg Thalheim 2023-01-02 11:35:39 +01:00
parent 01369215dc
commit d2c00b8c84

View file

@ -16,16 +16,13 @@
let let
inherit (pkgs) lib stdenv; inherit (pkgs) lib stdenv;
nix-eval-jobs = pkgs.callPackage ./default.nix {
inherit srcDir nix;
};
in in
(pkgs.callPackage ./default.nix { pkgs.mkShell {
inherit srcDir nix; inherit (nix-eval-jobs) buildInputs;
}).overrideAttrs (old: { nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [
src = null;
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.treefmt pkgs.treefmt
pkgs.llvmPackages.clang # clang-format pkgs.llvmPackages.clang # clang-format
pkgs.nixpkgs-fmt pkgs.nixpkgs-fmt
@ -37,10 +34,9 @@ in
])) ]))
]; ];
NODE_PATH = "${pkgs.nodePackages.prettier-plugin-toml}/lib/node_modules"; NODE_PATH = "${pkgs.nodePackages.prettier-plugin-toml}/lib/node_modules";
shellHook = lib.optionalString stdenv.isLinux '' 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}" export NIX_DEBUG_INFO_DIRS="${pkgs.curl.debug}/lib/debug:${nix.debug}/lib/debug''${NIX_DEBUG_INFO_DIRS:+:$NIX_DEBUG_INFO_DIRS}"
''; '';
}) }