diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-23 19:26:19 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-23 20:30:03 +0700 |
commit | c522fec2743ffb95f2bc296f249232d73ae57dd1 (patch) | |
tree | c29207eba8c137fd2e9ff59d7186c9a4dfd0cdc4 /pkgs/development/tools/misc/autogen | |
parent | f6a583eeece936a1d917de67194fec4b6c74cf1f (diff) | |
download | nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar.gz nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar.bz2 nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar.lz nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar.xz nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.tar.zst nixpkgs-c522fec2743ffb95f2bc296f249232d73ae57dd1.zip |
pkgs/development/tools: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/tools/misc/autogen')
-rw-r--r-- | pkgs/development/tools/misc/autogen/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 1bf3a0c2832..c6eb6916d1e 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which pkg-config perl autoreconfHook/*patches applied*/ - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # Debian: https://salsa.debian.org/debian/autogen/-/blob/master/debian/rules#L21 "--enable-timeout=78" ] - ++ (stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ++ (lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-libxml2=${libxml2.dev}" "--with-libxml2-cflags=-I${libxml2.dev}/include/libxml2" # the configure check for regcomp wants to run a host program @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # remove /build/** from RPATHs for f in "$bin"/bin/*; do local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated text and program generation tool"; license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = "https://www.gnu.org/software/autogen/"; |