pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -151,11 +151,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
buildInputs = [ readline python icu ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin xcbuild
|
||||
++ stdenv.lib.optional stdenv.isLinux patchelf;
|
||||
++ lib.optional stdenv.isDarwin xcbuild
|
||||
++ lib.optional stdenv.isLinux patchelf;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"
|
||||
+ stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
|
||||
+ lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";
|
||||
|
||||
buildFlags = [
|
||||
"LINK=c++"
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
chmod u+w -R .
|
||||
'';
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace build/toolchain/linux/BUILD.gn \
|
||||
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
|
||||
'';
|
||||
@@ -95,14 +95,14 @@ stdenv.mkDerivation rec {
|
||||
# ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
''host_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||
] ++ stdenv.lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
|
||||
] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
|
||||
|
||||
# with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit
|
||||
# to be exceeded
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
|
||||
|
||||
nativeBuildInputs = [ gn ninja pkg-config python ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
|
||||
buildInputs = [ glib icu ];
|
||||
|
||||
ninjaFlags = [ ":d8" "v8_monolith" ];
|
||||
|
||||
Reference in New Issue
Block a user