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/boost | |
parent | 046d24424ef32cca1227519f93f41b5ec8133f31 (diff) | |
download | nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.gz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.bz2 nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.lz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.xz nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.tar.zst nixpkgs-66e44425c6dfecbea68a5d6dc221ccd56561d4f1.zip |
pkgs/development/libraries: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/libraries/boost')
-rw-r--r-- | pkgs/development/libraries/boost/1.67.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 31f545ab12b..29993ed02b8 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: +{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { version = "1.67.0"; @@ -9,7 +9,7 @@ callPackage ./generic.nix (args // { sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h"; stripLen = 1; }) - ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + ] ++ lib.optionals stdenv.cc.isClang [ # Fixes https://github.com/boostorg/atomic/issues/15 (fetchpatch { url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ec3a28e2b1a..5a2b437d41d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , fetchpatch , which , buildPackages @@ -30,9 +30,9 @@ assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be build with clang >8, because pth was removed -assert with stdenv.lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); -with stdenv.lib; +with lib; let variant = concatStringsSep "," @@ -150,7 +150,7 @@ stdenv.mkDerivation { EOF ''; - NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; enableParallelBuilding = true; |