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

4
pkgs/development/libraries/boost/1.67.nix
View File

@@ -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";

8
pkgs/development/libraries/boost/generic.nix
View File

@@ -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;