git.iko.soy/typeable/nixpkgs
on master help sign in
gdb: configure a safe path instead of wrapping
commita3e008420e8d04d8b444272640deee52ef0dac8f authorTmplt <tmplt@dragons.rocks> dateTue 19 Nov 2019, 21:40 (7 years ago) parent6cff4ce
3 files changed+2−34
pkgs/development/tools/misc/gdb/default.nix+1 pkgs/development/tools/misc/gdb/wrapper.nix−31 pkgs/top-level/all-packages.nix+1−3
pkgs/development/tools/misc/gdb/default.nix+1
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
7070 "--with-gmp=${gmp.dev}"
7171 "--with-mpfr=${mpfr.dev}"
7272 "--with-expat" "--with-libexpat-prefix=${expat.dev}"
73+ "--with-auto-load-safe-path=${stdenv.cc.cc.lib}"
7374 ] ++ stdenv.lib.optional (!pythonSupport) "--without-python";
7475
7576 postInstall =
pkgs/development/tools/misc/gdb/wrapper.nixdeleted−31
@@ -1,31 +0,0 @@
1−{ stdenv, lib, makeWrapper, gdb-unwrapped, safePaths }:
2−
3−let
4− gdb = gdb-unwrapped;
5−in
6− stdenv.mkDerivation {
7− name = gdb.name;
8− nativeBuildInputs = [ makeWrapper ];
9− propagatedUserEnvPkgs = [ gdb ];
10− phases = "installPhase fixupPhase";
11−
12− # Find all gdb plugins in `safePaths` and
13− # mark these files as safe to load.
14− installPhase = ''
15− mkdir -p $out/share/gdb
16− initScript=$out/share/gdb/gdbinit
17− touch $initScript
18−
19− for safePath in ${lib.concatStringsSep " " safePaths}; do
20− for plugin in $(find $safePath | grep -- '.*-gdb.*'); do
21− echo add-auto-load-safe-path $plugin >> $initScript
22− done
23− done
24−
25− makeWrapper "${gdb}/bin/gdb" \
26− "$out/bin/gdb" \
27− --add-flags "-x $initScript"
28− '';
29−
30− meta = gdb.meta;
31− }
pkgs/top-level/all-packages.nix+1−3
@@ -10471,9 +10471,7 @@ in
1047110471
1047210472 bashdb = callPackage ../development/tools/misc/bashdb { };
1047310473
10474− gdb = callPackage ../development/tools/misc/gdb/wrapper.nix { safePaths = [ stdenv.cc.cc.lib ]; };
10475−
10476− gdb-unwrapped = callPackage ../development/tools/misc/gdb {
10474+ gdb = callPackage ../development/tools/misc/gdb {
1047710475 guile = null;
1047810476 };
1047910477