diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-22 00:00:13 +0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-21 19:11:02 -0800 |
| commit | 66e44425c6dfecbea68a5d6dc221ccd56561d4f1 (patch) | |
| tree | 0a5bf7d41356ad47b4e6f0a737bf16c9a4a5b01e /pkgs/development/libraries/v8 | |
| parent | 046d24424ef32cca1227519f93f41b5ec8133f31 (diff) | |
pkgs/development/libraries: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/libraries/v8')
| -rw-r--r-- | pkgs/development/libraries/v8/5_x.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index 050abe9e81bfc..441a5559b527d 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -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++" diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 40c551d826a41..c79073f04e4c2 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -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" ]; |