diff options
| author | Mihai Fufezan <[email protected]> | 2023-09-10 20:11:21 +0300 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2023-09-14 12:03:48 +0300 |
| commit | f6473aa3adacb5fbd63fda7c39cc2e9fd9540e6a (patch) | |
| tree | 064c8c5cf3d590e1eea74b255cfe1e61b1a181ee | |
| parent | 84f8f4d77ddf4b6c772459584234e1f8f9d5f2ce (diff) | |
| download | Hyprland-f6473aa3adacb5fbd63fda7c39cc2e9fd9540e6a.tar.gz Hyprland-f6473aa3adacb5fbd63fda7c39cc2e9fd9540e6a.zip | |
flake.lock: update nixpkgs and xdph
- nix/module: update xdph override
- nix/overlays: remove hyprland-share-picker (now built directly inside xdph)
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | nix/module.nix | 4 | ||||
| -rw-r--r-- | nix/overlays.nix | 2 |
4 files changed, 7 insertions, 12 deletions
@@ -25,11 +25,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1694025408, - "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", + "lastModified": 1694363988, + "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", + "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7", "type": "github" }, "original": { @@ -68,7 +68,6 @@ hyprland-nvidia # hyprland-extras xdg-desktop-portal-hyprland - hyprland-share-picker # dependencies hyprland-protocols wlroots-hyprland diff --git a/nix/module.nix b/nix/module.nix index 98789d15..fcb29837 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -10,9 +10,7 @@ with lib; let inherit (pkgs.stdenv.hostPlatform) system; finalPortalPackage = cfg.portalPackage.override { - hyprland-share-picker = inputs.xdph.packages.${system}.hyprland-share-picker.override { - hyprland = cfg.finalPackage; - }; + hyprland = cfg.finalPackage; }; in { # disables Nixpkgs Hyprland module to avoid conflicts diff --git a/nix/overlays.nix b/nix/overlays.nix index dbdfc6a2..3c38d740 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -52,8 +52,6 @@ in { # including forked or patched packages for compatibility. hyprland-extras = mkJoinedOverlays [ inputs.xdph.overlays.xdg-desktop-portal-hyprland - inputs.xdph.overlays.hyprland-share-picker - inputs.xdph.overlays.package-overrides ]; udis86 = final: prev: { |