diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 29bc6e601e65..1c4d6506b72e 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -9,6 +9,7 @@ , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , enableDebuginfod ? false, elfutils , guile ? null +, hostCpuOnly ? false , safePaths ? [ # $debugdir:$datadir/auto-load are whitelisted by default by GDB "$debugdir" "$datadir/auto-load" @@ -27,7 +28,7 @@ in assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { - pname = targetPrefix + basename; + pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; version = "13.1"; src = fetchurl { @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { "--program-prefix=${targetPrefix}" "--disable-werror" - "--enable-targets=all" "--enable-64-bit-bfd" + ] ++ lib.optional (!hostCpuOnly) "--enable-targets=all" ++ [ + "--enable-64-bit-bfd" "--disable-install-libbfd" "--disable-shared" "--enable-static" "--with-system-zlib" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27b79680848f..9484dc4d7fd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19102,6 +19102,8 @@ with pkgs; guile = null; }; + gdbHostCpuOnly = gdb.override { hostCpuOnly = true; }; + gf = callPackage ../development/tools/misc/gf { }; java-language-server = callPackage ../development/tools/java/java-language-server { };