From b6e1ee2c3343a419a0fb0f09146fba3ce21891e1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:39:58 +0100 Subject: [PATCH] liboil: unbreak on aarch64-darwin --- pkgs/development/libraries/liboil/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index bf36a14b1b17..4291b3668039 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" # errors - configureFlags = lib.optional stdenv.isDarwin "--build=x86_64"; + configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64"; # fixes a cast in inline asm: easier than patching buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; @@ -29,7 +29,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; }