mirror of
https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
synced 2024-12-25 02:49:49 +01:00
nix: overlays: replace sdbuscpp with sdbus-cpp_2
See comments in code. This change to prevent conflicts for other packages depending on `sdbus-cpp` in `pkgs`.
This commit is contained in:
parent
fb1ce16202
commit
b15018fc56
1 changed files with 16 additions and 4 deletions
|
@ -22,8 +22,8 @@ in {
|
|||
inputs.hyprland-protocols.overlays.default
|
||||
inputs.hyprutils.overlays.default
|
||||
inputs.hyprwayland-scanner.overlays.default
|
||||
self.overlays.sdbuscpp
|
||||
]);
|
||||
|
||||
xdg-desktop-portal-hyprland = lib.composeManyExtensions [
|
||||
(final: prev: {
|
||||
xdg-desktop-portal-hyprland = final.callPackage ./default.nix {
|
||||
|
@ -34,14 +34,26 @@ in {
|
|||
})
|
||||
];
|
||||
|
||||
sdbuscpp = final: prev: {
|
||||
sdbus-cpp = prev.sdbus-cpp.overrideAttrs (self: super: {
|
||||
# If `prev` already contains `sdbus-cpp_2`, do not modify the package set.
|
||||
# If the previous fixpoint does not contain the attribute,
|
||||
# create a new package attribute, `sdbus-cpp_2` by overriding `sdbus-cpp`
|
||||
# from `final` with the new version of `src`.
|
||||
#
|
||||
# This matches the naming/versioning scheme used in `nixos-unstable` as of writing (10-27-2024).
|
||||
#
|
||||
# This overlay can be applied to either a stable release of Nixpkgs, or any of the unstable branches.
|
||||
# If you're using an unstable branch (or a release one) which already has `sdbus-cpp_2`,
|
||||
# this overlay is effectively a wrapper of an identity function.
|
||||
#
|
||||
# TODO: Remove this overlay after the next stable Nixpkgs release.
|
||||
sdbus-cpp_2 = final: prev: {
|
||||
sdbus-cpp_2 = prev.sdbus-cpp_2 or final.sdbus-cpp.overrideAttrs (self: _: {
|
||||
version = "2.0.0";
|
||||
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "Kistler-group";
|
||||
repo = "sdbus-cpp";
|
||||
rev = "refs/tags/v${self.version}";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
|
||||
};
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue