pkgs/tools: stdenv.lib -> lib
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, acl }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, acl }:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# avoid retaining reference to CF during stdenv bootstrap
|
||||
configureFlags = stdenv.lib.optionals stdenv.isDarwin [
|
||||
configureFlags = lib.optionals stdenv.isDarwin [
|
||||
"gt_cv_func_CFPreferencesCopyAppValue=no"
|
||||
"gt_cv_func_CFLocaleCopyCurrent=no"
|
||||
"gt_cv_func_CFLocaleCopyPreferredLanguages=no"
|
||||
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
|
||||
# gnutar tries to call into gettext between `fork` and `exec`,
|
||||
# which is not safe on darwin.
|
||||
# see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/system.c --replace '_(' 'N_('
|
||||
'';
|
||||
|
||||
outputs = [ "out" "info" ];
|
||||
|
||||
buildInputs = [ ]
|
||||
++ stdenv.lib.optional stdenv.isLinux acl
|
||||
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
|
||||
++ lib.optional stdenv.isLinux acl
|
||||
++ lib.optional stdenv.isDarwin autoreconfHook;
|
||||
|
||||
# May have some issues with root compilation because the bootstrap tool
|
||||
# cannot be used as a login shell for now.
|
||||
FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
|
||||
FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
|
||||
|
||||
preConfigure = if stdenv.isCygwin then ''
|
||||
sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
|
||||
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
|
||||
archives).
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
priority = 10;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user