hyprwm/Hyprland
1
1
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2024-08-16 08:40:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

nix: add hyprland-protocols through pkgconfig (#1275)

Browse Source
This commit is contained in:
Mihai Fufezan 2023-01-07 20:25:20 +02:00 committed by GitHub
parent af4b9700b7
commit 809b7181a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -1,13 +1,17 @@
{ {
"nodes": { "nodes": {
"hyprland-protocols": { "hyprland-protocols": {
"flake": false, "inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1670703428, "lastModified": 1671839510,
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -15,7 +15,7 @@
hyprland-protocols = { hyprland-protocols = {
url = "github:hyprwm/hyprland-protocols"; url = "github:hyprwm/hyprland-protocols";
flake = false; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -50,7 +50,7 @@
stdenv = prev.gcc12Stdenv; stdenv = prev.gcc12Stdenv;
version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); version = props.version + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
wlroots = wlroots-hyprland; wlroots = wlroots-hyprland;
inherit (inputs) hyprland-protocols; inherit (inputs.hyprland-protocols.packages.${prev.hostPlatform.system}) hyprland-protocols;
}; };
hyprland-debug = hyprland.override {debug = true;}; hyprland-debug = hyprland.override {debug = true;};
hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;}; hyprland-no-hidpi = hyprland.override {hidpiXWayland = false;};

5
nix/default.nix
View File

@ -67,6 +67,7 @@ in
[ [
git git
cairo cairo
hyprland-protocols
libdrm libdrm
libinput libinput
libxkbcommon libxkbcommon
@ -99,10 +100,6 @@ in
postPatch = '' postPatch = ''
# Fix hardcoded paths to /usr installation # Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp sed -i "s#/usr#$out#" src/render/OpenGL.cpp
# for some reason rmdir doesn't work in a dirty tree
rmdir subprojects/hyprland-protocols || true
ln -s ${hyprland-protocols} subprojects/hyprland-protocols
''; '';
passthru.providedSessions = ["hyprland"]; passthru.providedSessions = ["hyprland"];