public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development/libraries: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-22 00:00:13 +07:00
committed by Jonathan Ringer
parent 046d24424e
commit 66e44425c6
1770 changed files with 4913 additions and 4912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gettext/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-csharp" "--with-xz"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its
# own wchar.h file, which does not cope well with the system's
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
xz.bin
];
# HACK, see #10874 (and 14664)
buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
buildInputs = lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
setupHooks = [
../../../build-support/setup-hooks/role.bash
@@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
};
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
// lib.optionalAttrs stdenv.isDarwin {
makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ];
}