diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e990cb683e7..10afc8d421e 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-expat" "--with-libexpat-prefix=${expat.dev}" + "--with-auto-load-safe-path=${stdenv.cc.cc.lib}" ] ++ stdenv.lib.optional (!pythonSupport) "--without-python"; postInstall = diff --git a/pkgs/development/tools/misc/gdb/wrapper.nix b/pkgs/development/tools/misc/gdb/wrapper.nix deleted file mode 100644 index 2313b0b897a..00000000000 --- a/pkgs/development/tools/misc/gdb/wrapper.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, makeWrapper, gdb-unwrapped, safePaths }: - -let - gdb = gdb-unwrapped; -in - stdenv.mkDerivation { - name = gdb.name; - nativeBuildInputs = [ makeWrapper ]; - propagatedUserEnvPkgs = [ gdb ]; - phases = "installPhase fixupPhase"; - - # Find all gdb plugins in `safePaths` and - # mark these files as safe to load. - installPhase = '' - mkdir -p $out/share/gdb - initScript=$out/share/gdb/gdbinit - touch $initScript - - for safePath in ${lib.concatStringsSep " " safePaths}; do - for plugin in $(find $safePath | grep -- '.*-gdb.*'); do - echo add-auto-load-safe-path $plugin >> $initScript - done - done - - makeWrapper "${gdb}/bin/gdb" \ - "$out/bin/gdb" \ - --add-flags "-x $initScript" - ''; - - meta = gdb.meta; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cad0c64d13..d04fcbb8978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10471,9 +10471,7 @@ in bashdb = callPackage ../development/tools/misc/bashdb { }; - gdb = callPackage ../development/tools/misc/gdb/wrapper.nix { safePaths = [ stdenv.cc.cc.lib ]; }; - - gdb-unwrapped = callPackage ../development/tools/misc/gdb { + gdb = callPackage ../development/tools/misc/gdb { guile = null; };