diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:05:22 +0200 |
commit | 503081fa5be25e5054f490182a13f1c517e0664d (patch) | |
tree | f1a5d09c71ff8fba0066b7d5481ed4b8da132ffa /pkgs/development/tools/misc | |
parent | 9b09b832fc390b306611b6ec3bfffcc4452629fe (diff) | |
parent | 52af1d0930732142937b8db6c28b7fcd16770a7c (diff) | |
download | nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.gz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.bz2 nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.lz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.xz nixlib-503081fa5be25e5054f490182a13f1c517e0664d.tar.zst nixlib-503081fa5be25e5054f490182a13f1c517e0664d.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gtkdialog/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f7dc2874aff5..e990cb683e7d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, zlib, dejagnu +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , guile ? null @@ -13,7 +13,7 @@ let basename = "gdb-${version}"; - version = "8.3"; + version = "8.3.1"; in assert pythonSupport -> python3 != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0"; + sha256 = "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"; }; postPatch = if stdenv.isDarwin then '' @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; - buildInputs = [ ncurses readline gmp mpfr expat zlib guile ] + buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] ++ stdenv.lib.optional pythonSupport python3 ++ stdenv.lib.optional doCheck dejagnu; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 02b4d1557678..efb61c4730fd 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }: +{stdenv, fetchurl, gtk2, pkgconfig }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 hicolor-icon-theme ]; + buildInputs = [ gtk2 ]; meta = { homepage = https://code.google.com/archive/p/gtkdialog/; |