From 6a8cb7ffa00f4a93efb3b86928e45ab5a995189f Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 18 Jun 2024 13:07:20 +0200 Subject: [PATCH] chore: nix shell: add gdb (#4476) seems to work better when it comes from the same nixpkgs that we use for building, it seems. And is plain convenient. --- flake.nix | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/flake.nix b/flake.nix index 7b22ac0ed343..aef11952f4c3 100644 --- a/flake.nix +++ b/flake.nix @@ -35,27 +35,28 @@ lean-packages = pkgs.callPackage (./nix/packages.nix) { src = ./.; inherit nix lean4-mode; }; devShellWithDist = pkgsDist: pkgs.mkShell.override { - stdenv = pkgs.overrideCC pkgs.stdenv lean-packages.llvmPackages.clang; - } ({ - buildInputs = with pkgs; [ - cmake gmp ccache - lean-packages.llvmPackages.llvm # llvm-symbolizer for asan/lsan - # TODO: only add when proven to not affect the flakification - #pkgs.python3 - tree # for CI - ]; - # https://github.com/NixOS/nixpkgs/issues/60919 - hardeningDisable = [ "all" ]; - # more convenient `ctest` output - CTEST_OUTPUT_ON_FAILURE = 1; - } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { - GMP = pkgsDist.gmp.override { withStatic = true; }; - GLIBC = pkgsDist.glibc; - GLIBC_DEV = pkgsDist.glibc.dev; - GCC_LIB = pkgsDist.gcc.cc.lib; - ZLIB = pkgsDist.zlib; - GDB = pkgsDist.gdb; - }); + stdenv = pkgs.overrideCC pkgs.stdenv lean-packages.llvmPackages.clang; + } ({ + buildInputs = with pkgs; [ + cmake gmp ccache + lean-packages.llvmPackages.llvm # llvm-symbolizer for asan/lsan + gdb + # TODO: only add when proven to not affect the flakification + #pkgs.python3 + tree # for CI + ]; + # https://github.com/NixOS/nixpkgs/issues/60919 + hardeningDisable = [ "all" ]; + # more convenient `ctest` output + CTEST_OUTPUT_ON_FAILURE = 1; + } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { + GMP = pkgsDist.gmp.override { withStatic = true; }; + GLIBC = pkgsDist.glibc; + GLIBC_DEV = pkgsDist.glibc.dev; + GCC_LIB = pkgsDist.gcc.cc.lib; + ZLIB = pkgsDist.zlib; + GDB = pkgsDist.gdb; + }); in { packages = lean-packages // rec { debug = lean-packages.override { debug = true; };