From 9b7d990c70b289fa66ec0faaf51536d50d05cb36 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 27 May 2022 13:13:02 +0000 Subject: [PATCH] Revert "btrfs-progs: fix musl build" This reverts commit a3d54dece70888e851a00a28a1895ea6b1928fdf. We now support systemd on Musl, so we don't need to disable btrfs-progs' support for it by default on Musl. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e623b2d067f4..1a482de62d91 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sphinx ]; - buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 udev zlib zstd ]; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; - configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace --disable-libudev"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; - makeFlags = lib.optionals stdenv.hostPlatform.isGnu [ "udevruledir=$(out)/lib/udev/rules.d" ]; + makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; installFlags = [ "install_python" ];