forked from mirrors/nixpkgs
libvpx: Don't use stdenv.cross
This commit is contained in:
parent
38dbd4b161
commit
5c99b2f341
pkgs/development/libraries/libvpx
|
@ -1,4 +1,5 @@
|
||||||
{stdenv, fetchFromGitHub, perl, yasm
|
{ stdenv, fetchFromGitHub, perl, yasm
|
||||||
|
, hostPlatform
|
||||||
, vp8DecoderSupport ? true # VP8 decoder
|
, vp8DecoderSupport ? true # VP8 decoder
|
||||||
, vp8EncoderSupport ? true # VP8 encoder
|
, vp8EncoderSupport ? true # VP8 encoder
|
||||||
, vp9DecoderSupport ? true # VP9 decoder
|
, vp9DecoderSupport ? true # VP9 decoder
|
||||||
|
@ -144,10 +145,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
postInstall = ''moveToOutput bin "$bin" '';
|
postInstall = ''moveToOutput bin "$bin" '';
|
||||||
|
|
||||||
crossAttrs = let
|
crossAttrs = {
|
||||||
isCygwin = stdenv.cross.libc == "msvcrt";
|
|
||||||
isDarwin = stdenv.cross.libc == "libSystem";
|
|
||||||
in {
|
|
||||||
configurePlatforms = [];
|
configurePlatforms = [];
|
||||||
configureFlags = configureFlags ++ [
|
configureFlags = configureFlags ++ [
|
||||||
#"--extra-cflags="
|
#"--extra-cflags="
|
||||||
|
@ -159,17 +157,17 @@ stdenv.mkDerivation rec {
|
||||||
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
|
# 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
|
# 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
|
# 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.cross.config}${(
|
"--force-target=${hostPlatform.config}${
|
||||||
if isDarwin then (
|
if hostPlatform.isDarwin then
|
||||||
if stdenv.cross.osxMinVersion == "10.10" then "14"
|
if hostPlatform.osxMinVersion == "10.10" then "14"
|
||||||
else if stdenv.cross.osxMinVersion == "10.9" then "13"
|
else if hostPlatform.osxMinVersion == "10.9" then "13"
|
||||||
else if stdenv.cross.osxMinVersion == "10.8" then "12"
|
else if hostPlatform.osxMinVersion == "10.8" then "12"
|
||||||
else if stdenv.cross.osxMinVersion == "10.7" then "11"
|
else if hostPlatform.osxMinVersion == "10.7" then "11"
|
||||||
else if stdenv.cross.osxMinVersion == "10.6" then "10"
|
else if hostPlatform.osxMinVersion == "10.6" then "10"
|
||||||
else if stdenv.cross.osxMinVersion == "10.5" then "9"
|
else if hostPlatform.osxMinVersion == "10.5" then "9"
|
||||||
else "8")
|
else "8"
|
||||||
else "")}-gcc"
|
else ""}-gcc"
|
||||||
(if isCygwin then "--enable-static-msvcrt" else "")
|
(if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{stdenv, fetchgit, perl, yasm
|
{ stdenv, fetchgit, perl, yasm
|
||||||
|
, hostPlatform
|
||||||
, vp8DecoderSupport ? true # VP8 decoder
|
, vp8DecoderSupport ? true # VP8 decoder
|
||||||
, vp8EncoderSupport ? true # VP8 encoder
|
, vp8EncoderSupport ? true # VP8 encoder
|
||||||
, vp9DecoderSupport ? true # VP9 decoder
|
, vp9DecoderSupport ? true # VP9 decoder
|
||||||
|
@ -152,10 +153,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
postInstall = ''moveToOutput bin "$bin" '';
|
postInstall = ''moveToOutput bin "$bin" '';
|
||||||
|
|
||||||
crossAttrs = let
|
crossAttrs = {
|
||||||
isCygwin = stdenv.cross.libc == "msvcrt";
|
|
||||||
isDarwin = stdenv.cross.libc == "libSystem";
|
|
||||||
in {
|
|
||||||
configurePlatforms = [];
|
configurePlatforms = [];
|
||||||
configureFlags = configureFlags ++ [
|
configureFlags = configureFlags ++ [
|
||||||
#"--extra-cflags="
|
#"--extra-cflags="
|
||||||
|
@ -166,17 +164,17 @@ stdenv.mkDerivation rec {
|
||||||
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
|
# 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
|
# 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
|
# 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.cross.config}${(
|
"--force-target=${hostPlatform.config}${
|
||||||
if isDarwin then (
|
if hostPlatform.isDarwin then
|
||||||
if stdenv.cross.osxMinVersion == "10.10" then "14"
|
if hostPlatform.osxMinVersion == "10.10" then "14"
|
||||||
else if stdenv.cross.osxMinVersion == "10.9" then "13"
|
else if hostPlatform.osxMinVersion == "10.9" then "13"
|
||||||
else if stdenv.cross.osxMinVersion == "10.8" then "12"
|
else if hostPlatform.osxMinVersion == "10.8" then "12"
|
||||||
else if stdenv.cross.osxMinVersion == "10.7" then "11"
|
else if hostPlatform.osxMinVersion == "10.7" then "11"
|
||||||
else if stdenv.cross.osxMinVersion == "10.6" then "10"
|
else if hostPlatform.osxMinVersion == "10.6" then "10"
|
||||||
else if stdenv.cross.osxMinVersion == "10.5" then "9"
|
else if hostPlatform.osxMinVersion == "10.5" then "9"
|
||||||
else "8")
|
else "8"
|
||||||
else "")}-gcc"
|
else ""}-gcc"
|
||||||
(if isCygwin then "--enable-static-msvcrt" else "")
|
(if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue