From 36dad3378d47f6730c2ca18f1ad7c3c946010242 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 3 Apr 2015 13:30:30 -0400 Subject: [PATCH] Use libvpx-git on Darwin libvpx 1.3.0 is extremely challenging for us to compile on Darwin. I think we would need to use clang 3.5 and patch the configure scripts heavily. But libvpx-git works great, so lets just use that instead --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fafca016dc2..eed826ad3417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6826,7 +6826,7 @@ let libviper = callPackage ../development/libraries/libviper { }; - libvpx = callPackage ../development/libraries/libvpx { }; + libvpx = if stdenv.isDarwin then libvpx-git else callPackage ../development/libraries/libvpx { }; libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { };