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

Merge pull request #68918 from dtzWill/update/stress-ng-0.10.05-musl 

stress-ng: 0.10.02 -> 0.10.05, fix w/musl
This commit is contained in:
Renaud 2019-09-27 15:46:40 +02:00 committed by GitHub
parent f524175e30 31be449657
commit 76519374dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/system/stress-ng/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stress-ng"; pname = "stress-ng";
version = "0.10.02"; version = "0.10.05";
src = fetchurl { src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "100daxz0j80jhmpfnqa78mvfwq1qj7zb67y7w9f747a0f1havvim"; sha256 = "0hkghs99fl8kzg3lkkd4w6cj5133zr9a415py0ng60kzrfffmgdy";
}; };
# All platforms inputs then Linux-only ones # All platforms inputs then Linux-only ones
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "/usr" "" substituteInPlace Makefile --replace "/usr" ""
''; '';
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1";
# Won't build on i686 because the binary will be linked again in the # Won't build on i686 because the binary will be linked again in the
# install phase without checking the dependencies. This will prevent # install phase without checking the dependencies. This will prevent
# triggering the rebuild. Why this only happens on i686 remains a # triggering the rebuild. Why this only happens on i686 remains a