diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
| commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
| tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/development/libraries/libvpx | |
| parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
| parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
| download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip | |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvpx')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvpx/1_8.nix | 14 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvpx/default.nix | 22 |
2 files changed, 23 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix index f1a2bf377cc0..befbafd5a4ec 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix @@ -69,7 +69,14 @@ stdenv.mkDerivation rec { # ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch ]; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,11 +142,6 @@ 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 diff --git a/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix index f19183966163..d538aa41bff3 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -65,7 +65,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w="; }; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + + # When cross-compiling (for aarch64-multiplatform), the compiler errors out on these flags. + # Since they're 'just' warnings, it's fine to just remove them. + substituteInPlace configure \ + --replace "check_add_cflags -Wparentheses-equality" "" \ + --replace "check_add_cflags -Wunreachable-code-loop-increment" "" \ + --replace "check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32" "" + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -131,12 +145,6 @@ 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 |