deepin: use qt5.mkDerivation where needed, cleanup wrappers #65248
Conversation
This switches a majority of the applications to using qt5.mkDerivation which automatically adds wrapQtAppsHook. In certain places, where GLib and gtk intersect with Qt, we also needed to use wrapGAppsHook. In these cases there will be multiple wrappers.
worldofpeace
force-pushed
the
mkDerivation/deepin
branch
from
cb89c42
to
d01d0c1
Compare
| @@ -1,8 +1,8 @@ | |||
| { stdenv, fetchFromGitHub, pkgconfig, cmake, qttools, | |||
| { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, | |||
There was a problem hiding this comment.
maybe I'm a bit late here, but why is it called mkDerivation? I'd prefer mkQtDerivation, to make name distinguishable from stock mkDerivation
There was a problem hiding this comment.
I have same concern about env name, which really-really should be called qtEnv, but this out of scope of this PR.
cc @ttuegel
There was a problem hiding this comment.
These names do not exist outside of the scope of Qt packages, so I judge there is little risk of collision. There is a precedent for mkDerivation in particular; haskellPackages does the same thing.
For those cases, could we use |
|
I thought of this as well, I've been doing similar with wrapGAppsHook and wrapPython. Though it's still not that great since it's a manual step. |
Commit Message
This switches a majority of the applications to using
qt5.mkDerivationwhich automatically adds
wrapQtAppsHook.In certain places, where GLib and gtk intersect with Qt, we
also needed to use
wrapGAppsHook. In these cases there will bemultiple wrappers.
Motivation for this change
Something we should be doing.
It would be best to test this with #63813, and I also believe it will make
the
lightdm-deepin-greetermodule function as expected.Edit:
lightdm-deepin-greeterappears to work as expected with this.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)