pkgs/development/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
|
||||
{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
|
||||
|
||||
assert guileSupport -> ( pkg-config != null && guile != null );
|
||||
|
||||
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
|
||||
./glibc-2.27-glob.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
|
||||
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
|
||||
nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
|
||||
buildInputs = lib.optionals guileSupport [ guile ];
|
||||
|
||||
configureFlags = stdenv.lib.optional guileSupport "--with-guile"
|
||||
configureFlags = lib.optional guileSupport "--with-guile"
|
||||
|
||||
# Make uses this test to decide whether it should keep track of
|
||||
# subseconds. Apple made this possible with APFS and macOS 10.13.
|
||||
@@ -37,11 +37,11 @@ stdenv.mkDerivation {
|
||||
# a second. So, tell Make to ignore nanoseconds in mtime here by
|
||||
# overriding the autoconf test for the struct.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
|
||||
++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
|
||||
++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
|
||||
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/make/";
|
||||
description = "A tool to control the generation of non-source files from sources";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
|
||||
{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
|
||||
|
||||
assert guileSupport -> ( pkg-config != null && guile != null );
|
||||
|
||||
@@ -21,10 +21,10 @@ stdenv.mkDerivation {
|
||||
./impure-dirs.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
|
||||
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
|
||||
nativeBuildInputs = lib.optionals guileSupport [ pkg-config ];
|
||||
buildInputs = lib.optionals guileSupport [ guile ];
|
||||
|
||||
configureFlags = stdenv.lib.optional guileSupport "--with-guile"
|
||||
configureFlags = lib.optional guileSupport "--with-guile"
|
||||
|
||||
# Make uses this test to decide whether it should keep track of
|
||||
# subseconds. Apple made this possible with APFS and macOS 10.13.
|
||||
@@ -33,11 +33,11 @@ stdenv.mkDerivation {
|
||||
# a second. So, tell Make to ignore nanoseconds in mtime here by
|
||||
# overriding the autoconf test for the struct.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/51221 for discussion.
|
||||
++ stdenv.lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
|
||||
++ lib.optional stdenv.isDarwin "ac_cv_struct_st_mtim_nsec=no";
|
||||
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/make/";
|
||||
description = "A tool to control the generation of non-source files from sources";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
Reference in New Issue
Block a user