pyrox.dev
Merge pull request #37933 from dtzWill/fix/parted-musl
parted: add missing fnctl include, fix w/musl
authored by Will Dietz and committed by GitHub 9c4745fe 1c110d52
+8
-3
pkgs/tools/misc/parted/default.nix
+8
-3
pkgs/tools/misc/parted/default.nix
···
1
-
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python2
2
, utillinux, check, enableStatic ? false, hurd ? null }:
3
4
stdenv.mkDerivation rec {
···
9
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
10
};
11
12
-
patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch;
13
14
postPatch = stdenv.lib.optionalString doCheck ''
15
patchShebangs tests
···
31
32
# Tests were previously failing due to Hydra running builds as uid 0.
33
# That should hopefully be fixed now.
34
-
doCheck = true;
35
36
preCheck =
37
stdenv.lib.optionalString doCheck
···
1
+
{ stdenv, fetchurl, fetchpatch, devicemapper, libuuid, gettext, readline, perl, python2
2
, utillinux, check, enableStatic ? false, hurd ? null }:
3
4
stdenv.mkDerivation rec {
···
9
sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
10
};
11
12
+
patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch
13
+
++ stdenv.lib.optional stdenv.hostPlatform.isMusl
14
+
(fetchpatch {
15
+
url = "https://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch?id=9c5cd3c329a40ba4559cc1d8c7d17a9bf95c237b";
16
+
sha256 = "117ypyiwvzym6pi8xmy16wa5z3sbpx7gh6haabs6kfb1x2894z7q";
17
+
});
18
19
postPatch = stdenv.lib.optionalString doCheck ''
20
patchShebangs tests
···
36
37
# Tests were previously failing due to Hydra running builds as uid 0.
38
# That should hopefully be fixed now.
39
+
doCheck = !stdenv.hostPlatform.isMusl; /* translation test */
40
41
preCheck =
42
stdenv.lib.optionalString doCheck