diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-30 13:59:16 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-30 13:59:16 +0000 |
| commit | 1fa310549ce217f31950025dd17a3f793d69769c (patch) | |
| tree | 5b19d651b1ae2d900a5f8b340cc4182b539262ee /pkgs/development/tools/misc/gdb/default.nix | |
| parent | a730888ce0c608789fbc57da7449c6a618b3e906 (diff) | |
| parent | d6fa6426088f377dca81af1526c0154789850bc7 (diff) | |
| download | nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar.gz nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar.bz2 nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar.lz nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar.xz nixlib-1fa310549ce217f31950025dd17a3f793d69769c.tar.zst nixlib-1fa310549ce217f31950025dd17a3f793d69769c.zip | |
Merge remote-tracking branch 'upstream/master' into add-tensorflow-2
Diffstat (limited to 'pkgs/development/tools/misc/gdb/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e125b7418f6b..baaba6245701 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "8.3.1"; + version = "9.1"; in assert pythonSupport -> python3 != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"; + sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"; }; postPatch = if stdenv.isDarwin then '' @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + # GDB have to be built out of tree. + preConfigure = '' + mkdir _build + cd _build + ''; + configureScript = "../configure"; + configureFlags = with stdenv.lib; [ "--enable-targets=all" "--enable-64-bit-bfd" "--disable-install-libbfd" @@ -100,6 +107,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; - maintainers = with maintainers; [ pierron globin ]; + maintainers = with maintainers; [ pierron globin lsix ]; }; } |