diff options
| author | figsoda <figsoda@pm.me> | 2023-01-04 20:51:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 20:51:57 -0500 |
| commit | 133dc3c11ba601a86583872a35dbe7d1c841f508 (patch) | |
| tree | d89f0843745498051583c88b940de78db165825e | |
| parent | 479053aa0b2e8ca7e0b945ea14e73a9f4647122b (diff) | |
| parent | b6e1ee2c3343a419a0fb0f09146fba3ce21891e1 (diff) | |
Merge pull request #209004 from wegank/liboil-darwin
liboil: unbreak on aarch64-darwin
| -rw-r--r-- | pkgs/development/libraries/liboil/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index bf36a14b1b17e..4291b3668039a 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; }; } |