nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

parted: add missing fnctl include, fix w/musl

Browse Source 
Disable tests on musl, maybe fix or refine this in the future.
This commit is contained in:
Will Dietz 2018-03-26 17:31:32 -05:00
parent 1c110d5285
commit ee9ad96898
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/misc/parted/default.nix
View File

@ -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 }: , utillinux, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; 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 '' postPatch = stdenv.lib.optionalString doCheck ''
patchShebangs tests patchShebangs tests
@ -31,7 +36,7 @@ stdenv.mkDerivation rec {
# Tests were previously failing due to Hydra running builds as uid 0. # Tests were previously failing due to Hydra running builds as uid 0.
# That should hopefully be fixed now. # That should hopefully be fixed now.
doCheck = true; doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
preCheck = preCheck =
stdenv.lib.optionalString doCheck stdenv.lib.optionalString doCheck