flake.lock: update nixpkgs and xdph

- nix/module: update xdph override
- nix/overlays: remove hyprland-share-picker (now built directly inside xdph)
This commit is contained in:
Mihai Fufezan 2023-09-10 20:11:21 +03:00 committed by Mihai Fufezan
parent 84f8f4d77d
commit f6473aa3ad
4 changed files with 7 additions and 12 deletions

View file

@ -25,11 +25,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1693844670, "lastModified": 1694183432,
"narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694025408, "lastModified": 1694363988,
"narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "022469529c8bc95acf222dc5a62389b04c8b1205", "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -68,7 +68,6 @@
hyprland-nvidia hyprland-nvidia
# hyprland-extras # hyprland-extras
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
hyprland-share-picker
# dependencies # dependencies
hyprland-protocols hyprland-protocols
wlroots-hyprland wlroots-hyprland

View file

@ -10,10 +10,8 @@ with lib; let
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
finalPortalPackage = cfg.portalPackage.override { finalPortalPackage = cfg.portalPackage.override {
hyprland-share-picker = inputs.xdph.packages.${system}.hyprland-share-picker.override {
hyprland = cfg.finalPackage; hyprland = cfg.finalPackage;
}; };
};
in { in {
# disables Nixpkgs Hyprland module to avoid conflicts # disables Nixpkgs Hyprland module to avoid conflicts
disabledModules = ["programs/hyprland.nix"]; disabledModules = ["programs/hyprland.nix"];

View file

@ -52,8 +52,6 @@ in {
# including forked or patched packages for compatibility. # including forked or patched packages for compatibility.
hyprland-extras = mkJoinedOverlays [ hyprland-extras = mkJoinedOverlays [
inputs.xdph.overlays.xdg-desktop-portal-hyprland inputs.xdph.overlays.xdg-desktop-portal-hyprland
inputs.xdph.overlays.hyprland-share-picker
inputs.xdph.overlays.package-overrides
]; ];
udis86 = final: prev: { udis86 = final: prev: {