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

Revert "btrfs-progs: fix musl build"

Browse Source 
This reverts commit a3d54dece7.

We now support systemd on Musl, so we don't need to disable
btrfs-progs' support for it by default on Musl.
This commit is contained in:
Alyssa Ross 2022-05-27 13:13:02 +00:00
parent 60a0871486
commit 9b7d990c70
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/btrfs-progs/default.nix
View File

@ -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" ];