mirror of
https://github.com/hyprwm/xdg-desktop-portal-hyprland.git
synced 2024-11-23 22:55:58 +01:00
CI: update actions
nix/overlays: simplify overlay
This commit is contained in:
parent
0e2f3b9c85
commit
7f2a77ddf6
2 changed files with 7 additions and 12 deletions
15
.github/workflows/nix-build.yaml
vendored
15
.github/workflows/nix-build.yaml
vendored
|
@ -8,14 +8,9 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Clone repository
|
- name: Clone repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
|
||||||
submodules: recursive
|
- uses: cachix/install-nix-action@v27
|
||||||
- name: Install nix
|
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||||
uses: cachix/install-nix-action@v17
|
|
||||||
with:
|
|
||||||
install_url: https://releases.nixos.org/nix/nix-2.10.3/install
|
|
||||||
extra_nix_config: |
|
|
||||||
auto-optimise-store = true
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
- name: Build xdg-desktop-portal-hyprland
|
- name: Build xdg-desktop-portal-hyprland
|
||||||
run: nix build --print-build-logs
|
run: nix build --print-build-logs --extra-substituters "https://hyprland.cachix.org"
|
||||||
|
|
|
@ -18,15 +18,15 @@
|
||||||
in {
|
in {
|
||||||
default = mkJoinedOverlays (with self.overlays; [
|
default = mkJoinedOverlays (with self.overlays; [
|
||||||
xdg-desktop-portal-hyprland
|
xdg-desktop-portal-hyprland
|
||||||
|
inputs.hyprlang.overlays.default
|
||||||
|
inputs.hyprland-protocols.overlays.default
|
||||||
]);
|
]);
|
||||||
xdg-desktop-portal-hyprland = lib.composeManyExtensions [
|
xdg-desktop-portal-hyprland = lib.composeManyExtensions [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
xdg-desktop-portal-hyprland = final.callPackage ./default.nix {
|
xdg-desktop-portal-hyprland = final.callPackage ./default.nix {
|
||||||
stdenv = prev.gcc13Stdenv;
|
stdenv = prev.gcc13Stdenv;
|
||||||
inherit (final) hyprland-protocols;
|
|
||||||
inherit (final.qt6) qtbase qttools wrapQtAppsHook qtwayland;
|
inherit (final.qt6) qtbase qttools wrapQtAppsHook qtwayland;
|
||||||
inherit version;
|
inherit version;
|
||||||
inherit (inputs.hyprlang.packages.${prev.system}) hyprlang;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue