pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #177374 from dali99/libaom-pbi

Fix staging build for `gst_all_1.gst-plugins-bad`

authored by Sergei Trofimovich and committed by GitHub 6614d564 620cb7cc

+8 -7
unified split
+3 -5
pkgs/development/libraries/libaom/default.nix
··· 1 1 { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 2 - , enableButteraugli ? false, libjxl, libhwy # Broken 2 + , enableButteraugli ? false, libjxl # Broken 3 3 , enableVmaf ? true, libvmaf 4 4 }: 5 5 ··· 19 19 yasm perl cmake pkg-config python3 20 20 ]; 21 21 22 - buildInputs = lib.optionals enableButteraugli [ 23 - libjxl 24 - libhwy 25 - ] ++ lib.optional enableVmaf libvmaf; 22 + propagatedBuildInputs = lib.optional enableButteraugli libjxl 23 + ++ lib.optional enableVmaf libvmaf; 26 24 27 25 preConfigure = '' 28 26 # build uses `git describe` to set the build version
+5 -2
pkgs/development/libraries/libjxl/default.nix
··· 78 78 # conclusively in its README or otherwise; they can best be determined 79 79 # by checking the CMake output for "Could NOT find". 80 80 buildInputs = [ 81 - brotli 82 81 giflib 83 82 gperftools # provides `libtcmalloc` 84 - libhwy 85 83 libjpeg 86 84 libpng 87 85 libwebp 88 86 openexr 89 87 zlib 88 + ]; 89 + 90 + propagatedBuildInputs = [ 91 + brotli 92 + libhwy 90 93 ]; 91 94 92 95 cmakeFlags = [