New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
libva, libva-utils and vaapiIntel: split into v1 and v2 #32796
Conversation
26f208d
to
0c30cd1
Compare
in { | ||
# libva-utils 1.8.3 requires libva 2.0.0+ | ||
libva-utils_1 = generic "0pxd9v783p9zh8a9zyi6kaknsbjd4s6lxcyaqqlrbkn1n4yq96ai" libva_2; | ||
libva-utils_2 = generic "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi" libva_2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a typo? EDIT: I mean both versions of utils using libva_2
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, the passed hash parameter isn't even used :-)
license = licenses.mit; | ||
maintainers = with maintainers; [ garbas ]; | ||
platforms = platforms.unix; | ||
passthru = { inherit version; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would personally prefer to inherit it directly (i.e. pass it inside like name
):
- it's typically done in nixpkgs nowadays,
- it avoids yet another mass rebuild.
Added (proposed) fixes of my suggestions and an evaluation error. (Assuming we would |
libva = callPackage ../development/libraries/libva { }; | ||
libva-full = libva.override { minimal = false; }; | ||
libva-utils = callPackage ../development/libraries/libva-utils { }; | ||
inherit (callPackage ../development/libraries/libva { }) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's callPackages
too for this sort of thing. Better so that override
works per-package, rather than being lost.
Oh, I think all the breakages have been fixed in other ways by Orivej. Let me close until we find a use case for the split. |
@vcunat and @Ericson2314 - thanks for your feedback. This is indeed not necessary given that everything else now works with libva 2. I wasn't aware of |
Motivation for this change
We need to carry both v1 and v2 of the
libva
libraries as not all downstream projects have been updated accordingly.Further to #32599
Currently building here.
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)