From 53b6a4f063bf14bec3d75d4052f347d0c7710d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 13 May 2015 21:24:48 +0000 Subject: [PATCH] Hack for btrfsProgs in ARM, due to a gcc bug. It fails to build otherwise: /tmp/nix-build-btrfs-progs-4.0.drv-4/ccUNrySY.s:4014: Error: invalid operands (.text and *UND* sections) for `-' --- pkgs/tools/filesystems/btrfsprogs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 9286d58482f..e2ed76494a1 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -3,7 +3,7 @@ let version = "4.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "btrfs-progs-${version}"; src = fetchurl { @@ -28,4 +28,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.linux; }; -} +} // (if stdenv.isArm then { + # gcc bug with -O1 on ARM + patchPhase = "sed -i s/-O1/-O2/ configure"; +} else {}))