diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/tools/misc/parted/default.nix | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/tools/misc/parted/default.nix')
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 68240210e746..3a05a1927dbc 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2 +{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2 , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; - patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl + (fetchpatch { + url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b"; + sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q"; + }); postPatch = stdenv.lib.optionalString doCheck '' patchShebangs tests @@ -31,7 +36,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. - doCheck = true; + doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ preCheck = stdenv.lib.optionalString doCheck |