public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Browse Source 
Cross compilation fixes [april 2020]
This commit is contained in:
Matthew Bauer
2020-04-13 16:48:38 -04:00
committed by GitHub
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libvpx/default.nix
+1 -7
View File
@@ -135,16 +135,10 @@ stdenv.mkDerivation rec {
experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental")
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"--extra-cflags="
#"--extra-cxxflags="
#"--prefix="
#"--libc="
#"--libdir="
"--enable-external-build"
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
# See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
# Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
"--force-target=${stdenv.hostPlatform.config}${
"--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${stdenv.hostPlatform.parsed.kernel.name}${
if stdenv.hostPlatform.isDarwin then
if stdenv.hostPlatform.osxMinVersion == "10.10" then "14"
else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13"