hyprwm/xdg-desktop-portal-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git synced 2024-12-22 09:49:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

flake.lock: update

Browse source 
nix/overlays: add overlay to allow building until next hyprland version
This commit is contained in:
Mihai Fufezan 2024-12-17 10:08:11 +02:00
parent 7116c9ffff
commit 3e884d941c
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
3 changed files with 38 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
flake.lock
View file

@ -25,7 +25,9 @@
}, },
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"hyprutils": "hyprutils", "hyprutils": [
"hyprutils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -34,11 +36,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728168612, "lastModified": 1734364628,
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,31 +50,6 @@
} }
}, },
"hyprutils": { "hyprutils": {
"inputs": {
"nixpkgs": [
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1721324102,
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "962582a090bc233c4de9d9897f46794280288989",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -82,11 +59,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732288281, "lastModified": 1733502241,
"narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "rev": "104117aed6dd68561be38b50f218190aa47f2cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +97,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1734119587,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,7 +115,7 @@
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems" "systems": "systems"

1
flake.nix
View file

@ -15,6 +15,7 @@
hyprlang = { hyprlang = {
url = "github:hyprwm/hyprlang"; url = "github:hyprwm/hyprlang";
inputs.hyprutils.follows = "hyprutils";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };

19
nix/overlays.nix
View file

@ -17,6 +17,7 @@ in {
default = lib.composeManyExtensions [ default = lib.composeManyExtensions [
self.overlays.xdg-desktop-portal-hyprland self.overlays.xdg-desktop-portal-hyprland
self.overlays.sdbus-cpp_2 self.overlays.sdbus-cpp_2
self.overlays.hypr-gcc14Stdenv
inputs.hyprland-protocols.overlays.default inputs.hyprland-protocols.overlays.default
inputs.hyprwayland-scanner.overlays.default inputs.hyprwayland-scanner.overlays.default
inputs.hyprlang.overlays.default inputs.hyprlang.overlays.default
@ -46,7 +47,9 @@ in {
# #
# TODO: Remove this overlay after the next stable Nixpkgs release. # TODO: Remove this overlay after the next stable Nixpkgs release.
sdbus-cpp_2 = final: prev: { sdbus-cpp_2 = final: prev: {
sdbus-cpp_2 = prev.sdbus-cpp_2 or (final.sdbus-cpp.overrideAttrs (self: _: { sdbus-cpp_2 =
prev.sdbus-cpp_2
or (final.sdbus-cpp.overrideAttrs (self: _: {
version = "2.0.0"; version = "2.0.0";
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
@ -57,4 +60,18 @@ in {
}; };
})); }));
}; };
# TODO: remove this when the next version of Hyprland is available (in Nixpkgs)
hypr-gcc14Stdenv = final: prev: {
hyprcursor = (prev.hyprcursor.override {stdenv = prev.gcc14Stdenv;}).overrideAttrs (self: super: {
src = final.fetchFromGitHub {
owner = "hyprwm";
repo = "hyprcursor";
rev = "f388aacd22be4a6e4d634fbaf6f75eb0713d239a";
hash = "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=";
};
});
hyprlang = prev.hyprlang.override {stdenv = prev.gcc14Stdenv;};
hyprutil = prev.hyprutil.override {stdenv = prev.gcc14Stdenv;};
};
} }