pkgs/development/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, targetPackages
|
||||
{ lib, stdenv, targetPackages
|
||||
|
||||
# Build time
|
||||
, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
let
|
||||
basename = "gdb";
|
||||
targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
"${stdenv.targetPlatform.config}-";
|
||||
in
|
||||
|
||||
@@ -40,15 +40,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./debug-info-from-env.patch
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./darwin-target-match.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
|
||||
|
||||
buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
|
||||
++ stdenv.lib.optional pythonSupport python3
|
||||
++ stdenv.lib.optional doCheck dejagnu;
|
||||
++ lib.optional pythonSupport python3
|
||||
++ lib.optional doCheck dejagnu;
|
||||
|
||||
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
|
||||
|
||||
@@ -57,12 +57,12 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# darwin build fails with format hardening since v7.12
|
||||
hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ];
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
|
||||
configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
|
||||
|
||||
# GDB have to be built out of tree.
|
||||
preConfigure = ''
|
||||
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
configureScript = "../configure";
|
||||
|
||||
configureFlags = with stdenv.lib; [
|
||||
configureFlags = with lib; [
|
||||
"--enable-targets=all" "--enable-64-bit-bfd"
|
||||
"--disable-install-libbfd"
|
||||
"--disable-shared" "--enable-static"
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-mpfr=${mpfr.dev}"
|
||||
"--with-expat" "--with-libexpat-prefix=${expat.dev}"
|
||||
"--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
|
||||
] ++ stdenv.lib.optional (!pythonSupport) "--without-python";
|
||||
] ++ lib.optional (!pythonSupport) "--without-python";
|
||||
|
||||
postInstall =
|
||||
'' # Remove Info files already provided by Binutils and other packages.
|
||||
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
|
||||
# TODO: Investigate & fix the test failures.
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The GNU Project debugger";
|
||||
|
||||
longDescription = ''
|
||||
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://www.gnu.org/software/gdb/";
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = with platforms; linux ++ cygwin ++ darwin;
|
||||
maintainers = with maintainers; [ pierron globin lsix ];
|
||||
|
||||
Reference in New Issue
Block a user