From bdf5a5c20e8912f3e8115b9c7f9176da91fcacf3 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 19:52:46 +1000 Subject: [PATCH] liboil: fix build on darwin * force --build=x86_64 --- pkgs/development/libraries/liboil/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 45f75b4f8052..de2ffdffca76 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -12,9 +12,15 @@ stdenv.mkDerivation rec { patches = [ ./x86_64-cpuid.patch ]; - meta = { - homepage = http://liboil.freedesktop.org; + # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" + # errors + configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; + + meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - license = "BSD-2"; + homepage = http://liboil.freedesktop.org; + license = libraries.bsd2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; }