public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit staging+systemd into closure-size

Browse Source 
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:13 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708456 additions and 130039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gmp/4.3.2.nix
View File

@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
then "ln -sf configfsf.guess config.guess"
else ''echo "Darwin host is `./config.guess`."'';
configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
stdenv.lib.optionalString stdenv.isDarwin " ac_cv_build=x86_64-apple-darwin13.4.0 ac_cv_host=x86_64-apple-darwin13.4.0";
# The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
# Newer versions of GMP don't have that issue anymore.

9
pkgs/development/libraries/gmp/5.1.x.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
with { inherit (stdenv.lib) optional; };
with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec {
name = "gmp-5.1.3";
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
++ optional stdenv.is64bit "--with-pic"
;
# 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.
preConfigure = optionalString stdenv.isArm ''
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
doCheck = true;
dontDisableStatic = withStatic;

9
pkgs/development/libraries/gmp/6.x.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
with { inherit (stdenv.lib) optional; };
with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec {
name = "gmp-6.0.0a";
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
++ optional stdenv.is64bit "--with-pic"
;
# 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.
preConfigure = optionalString stdenv.isArm ''
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
doCheck = true;
dontDisableStatic = withStatic;