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

libvpx: Get rid of crossAttrs

Browse Source 
Only breaks native hashes because configurePlatforms
This commit is contained in:
John Ericson 2018-05-10 13:43:12 -04:00
parent 01b274ce0d
commit 1e966f9aa6
2 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/libraries/libvpx/default.nix
View File

@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
setOutputFlags = false; setOutputFlags = false;
configurePlatforms = [];
configureFlags = [ configureFlags = [
(enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
(enableFeature vp8EncoderSupport "vp8-encoder") (enableFeature vp8EncoderSupport "vp8-encoder")
@ -131,23 +132,7 @@ stdenv.mkDerivation rec {
(enableFeature (experimentalSpatialSvcSupport || (enableFeature (experimentalSpatialSvcSupport ||
experimentalFpMbStatsSupport || experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental") experimentalEmulateHardwareSupport) "experimental")
# Experimental features ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
nativeBuildInputs = [ perl yasm ];
buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];
enableParallelBuilding = true;
postInstall = ''moveToOutput bin "$bin" '';
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
#"--extra-cflags=" #"--extra-cflags="
#"--extra-cxxflags=" #"--extra-cxxflags="
#"--prefix=" #"--prefix="
@ -168,8 +153,19 @@ stdenv.mkDerivation rec {
else "8" else "8"
else ""}-gcc" else ""}-gcc"
(if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
]; ] # Experimental features
}; ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
nativeBuildInputs = [ perl yasm ];
buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];
enableParallelBuilding = true;
postInstall = ''moveToOutput bin "$bin" '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "WebM VP8/VP9 codec SDK"; description = "WebM VP8/VP9 codec SDK";

34
pkgs/development/libraries/libvpx/git.nix
View File

@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
setOutputFlags = false; setOutputFlags = false;
configurePlatforms = [];
configureFlags = [ configureFlags = [
(enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
(enableFeature vp8EncoderSupport "vp8-encoder") (enableFeature vp8EncoderSupport "vp8-encoder")
@ -139,23 +140,7 @@ stdenv.mkDerivation rec {
(enableFeature (experimentalSpatialSvcSupport || (enableFeature (experimentalSpatialSvcSupport ||
experimentalFpMbStatsSupport || experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental") experimentalEmulateHardwareSupport) "experimental")
# Experimental features ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
nativeBuildInputs = [ perl yasm ];
buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];
enableParallelBuilding = true;
postInstall = ''moveToOutput bin "$bin" '';
crossAttrs = {
configurePlatforms = [];
configureFlags = configureFlags ++ [
#"--extra-cflags=" #"--extra-cflags="
#"--prefix=" #"--prefix="
#"--libc=" #"--libc="
@ -175,8 +160,19 @@ stdenv.mkDerivation rec {
else "8" else "8"
else ""}-gcc" else ""}-gcc"
(if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
]; ] # Experimental features
}; ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
nativeBuildInputs = [ perl yasm ];
buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];
enableParallelBuilding = true;
postInstall = ''moveToOutput bin "$bin" '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "WebM VP8/VP9 codec SDK"; description = "WebM VP8/VP9 codec SDK";