pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, m4, cxx ? true }:
|
||||
{ lib, stdenv, fetchurl, m4, cxx ? true }:
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
name = "gmp-4.3.2";
|
||||
@@ -28,8 +28,8 @@ let self = stdenv.mkDerivation rec {
|
||||
else ''echo "Darwin host is `./config.guess`."'';
|
||||
|
||||
configureFlags = [
|
||||
(stdenv.lib.enableFeature cxx "cxx")
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
(lib.enableFeature cxx "cxx")
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"ac_cv_build=x86_64-apple-darwin13.4.0"
|
||||
"ac_cv_host=x86_64-apple-darwin13.4.0"
|
||||
];
|
||||
@@ -65,10 +65,10 @@ let self = stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
homepage = "https://gmplib.org/";
|
||||
license = stdenv.lib.licenses.lgpl3Plus;
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = lib.platforms.all;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, m4
|
||||
{ lib, stdenv, fetchurl, m4
|
||||
, cxx ? true
|
||||
, withStatic ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
let inherit (stdenv.lib) optional; in
|
||||
let inherit (lib) optional; in
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
name = "gmp-5.1.3";
|
||||
@@ -25,13 +25,13 @@ let self = stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--with-pic"
|
||||
(stdenv.lib.enableFeature cxx "cxx")
|
||||
(lib.enableFeature cxx "cxx")
|
||||
# Build a "fat binary", with routines for several sub-architectures
|
||||
# (x86), except on Solaris where some tests crash with "Memory fault".
|
||||
# See <https://hydra.nixos.org/build/2760931>, for instance.
|
||||
#
|
||||
# no darwin because gmp uses ASM that clang doesn't like
|
||||
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||
(lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||
# The config.guess in GMP tries to runtime-detect various
|
||||
# ARM optimization flags via /proc/cpuinfo (and is also
|
||||
# broken on multicore CPUs). Avoid this impurity.
|
||||
@@ -46,7 +46,7 @@ let self = stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://gmplib.org/";
|
||||
description = "GNU multiple precision arithmetic library";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, m4
|
||||
{ lib, stdenv, fetchurl, m4
|
||||
, cxx ? !stdenv.hostPlatform.useAndroidPrebuilt && !stdenv.hostPlatform.isWasm
|
||||
, buildPackages
|
||||
, withStatic ? stdenv.hostPlatform.isStatic
|
||||
@@ -9,7 +9,7 @@
|
||||
# cgit) that are needed here should be included directly in Nixpkgs as
|
||||
# files.
|
||||
|
||||
let inherit (stdenv.lib) optional; in
|
||||
let inherit (lib) optional; in
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
name = "gmp-6.2.1";
|
||||
@@ -30,13 +30,13 @@ let self = stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--with-pic"
|
||||
(stdenv.lib.enableFeature cxx "cxx")
|
||||
(lib.enableFeature cxx "cxx")
|
||||
# Build a "fat binary", with routines for several sub-architectures
|
||||
# (x86), except on Solaris where some tests crash with "Memory fault".
|
||||
# See <https://hydra.nixos.org/build/2760931>, for instance.
|
||||
#
|
||||
# no darwin because gmp uses ASM that clang doesn't like
|
||||
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||
(lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||
# The config.guess in GMP tries to runtime-detect various
|
||||
# ARM optimization flags via /proc/cpuinfo (and is also
|
||||
# broken on multicore CPUs). Avoid this impurity.
|
||||
@@ -54,7 +54,7 @@ let self = stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://gmplib.org/";
|
||||
description = "GNU multiple precision arithmetic library";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
Reference in New Issue
Block a user