From 481be8185fbc6d3d01382347c45075032508e48a Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:03:46 +1000 Subject: [PATCH] libvpx: fix build on darwin * remove --enable-shared configure flag * replace '-arch x86_64' with 'march=x86-64' --- pkgs/development/libraries/libvpx/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 494a5c36a3c..3ca2239ac8e 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -21,27 +21,26 @@ stdenv.mkDerivation rec { preConfigure = '' mkdir -p build cd build + substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64" ''; configureScript = "../configure"; - configureFlags = [ - "--disable-install-srcs" - "--disable-install-docs" - "--disable-examples" - "--enable-vp8" - "--enable-runtime-cpu-detect" - "--enable-shared" - "--enable-pic" - ]; + configureFlags = + [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" + "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] + # --enable-shared is only supported on ELF + ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared"; installPhase = '' make quiet=false DIST_DIR=$out install ''; - meta = { + meta = with stdenv.lib; { description = "VP8 video encoder"; - homepage = http://code.google.com/p/webm; - license = "BSD"; + homepage = http://code.google.com/p/webm; + license = licenses.bsd; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; }