This commit is contained in:
Mihai Fufezan 2024-01-03 17:24:17 +02:00
parent a2c37e2d6e
commit 874c6ab200
No known key found for this signature in database
4 changed files with 42 additions and 25 deletions

View File

@ -1,23 +1,5 @@
{ {
"nodes": { "nodes": {
"hyprlang": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1704112024,
"narHash": "sha256-eKS5iEiyfxQYc4R0Bofxtd9rdCCDzw8kpYZx/xj6wb0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "5cb3d2ba62d94b1e470d308ae05a9589b22c3c07",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -41,13 +23,47 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1704287638,
"narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694183432, "lastModified": 1702645756,
"narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1703961334,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,9 +76,9 @@
"root": { "root": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs", "hyprlang": "hyprlang",
"systems": "systems", "nixpkgs": "nixpkgs_2",
"hyprlang": "hyprlang" "systems": "systems"
} }
}, },
"systems": { "systems": {

View File

@ -38,7 +38,6 @@
packages = eachSystem (system: { packages = eachSystem (system: {
inherit (pkgsFor.${system}) xdg-desktop-portal-hyprland; inherit (pkgsFor.${system}) xdg-desktop-portal-hyprland;
default = self.packages.${system}.xdg-desktop-portal-hyprland; default = self.packages.${system}.xdg-desktop-portal-hyprland;
inherit (inputs.hyprlang.packages.${system}) hyprlang;
}); });
formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra); formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);

View File

@ -25,6 +25,7 @@ in {
inherit (final) hyprland-protocols; 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;
}; };
}; };
} }

View File

@ -5,6 +5,7 @@ executable('xdg-desktop-portal-hyprland',
[src, wl_proto_files], [src, wl_proto_files],
dependencies: [ dependencies: [
dependency('gbm'), dependency('gbm'),
dependency('hyprlang'),
dependency('libdrm'), dependency('libdrm'),
dependency('libpipewire-0.3'), dependency('libpipewire-0.3'),
dependency('sdbus-c++'), dependency('sdbus-c++'),