diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-25 04:38:18 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-25 05:01:40 +0200 |
| commit | 6324e8ef15c037ce470d203e5ce0d2fc52b626b9 (patch) | |
| tree | 70aa86462b09505ed8f53454e4ae281e2e517dac /pkgs/tools/system | |
| parent | 1054399bef7651a29e3e2e3ad304fea8508deb60 (diff) | |
| download | nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar.gz nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar.bz2 nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar.lz nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar.xz nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.tar.zst nixlib-6324e8ef15c037ce470d203e5ce0d2fc52b626b9.zip | |
stress-ng: 0.06.11 -> 0.06.14, fix i686 build
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/stress-ng/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index c45cc8a596b1..cdc7122fcc4b 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "stress-ng-${version}"; - version = "0.06.11"; + version = "0.06.14"; src = fetchurl { - sha256 = "0481aji9hdq8qbslrrc87r2p2pn8jxf913ac8wm5kxj02yqf7ccv"; + sha256 = "06kycxfwkdrm2vs9xk8cb6c1mki29ymrrqwwxxqx4icnwvq135hv"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "/usr" "" ''; - enableParallelBuilding = true; + # Won't build on i686 because the binary will be linked again in the + # install phase without checking the dependencies. This will prevent + # triggering the rebuild. Why this only happens on i686 remains a + # mystery, though. :-( + enableParallelBuilding = (!stdenv.isi686); installFlags = [ "DESTDIR=$(out)" ]; |