zoriya/gaze
1
0
Fork 0
mirror of https://github.com/zoriya/gaze.git synced 2026-06-05 10:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wlroots from nixpkgs and fix zig version

Browse Source
This commit is contained in:
Zoe Roux
2024-02-29 15:33:32 +01:00
parent b5cb0eaee4
commit f9bf12e458
2 changed files with 24 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+21 -41
View File
@@ -52,11 +52,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
@@ -88,11 +88,11 @@
]
},
"locked": {
"lastModified": 1694102001,
"narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
"lastModified": 1703887061,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github"
},
"original": {
@@ -104,22 +104,22 @@
"langref": {
"flake": false,
"locked": {
"narHash": "sha256-mYdDCBdNEIeMbavdhSo8qXqW+3fqPC8BAich7W3umrI=",
"narHash": "sha256-94broSBethRhPJr0G9no4TPyB8ee6BQ/hHK1QnLPln0=",
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in"
"url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/63bd2bff12992aef0ce23ae4b344e9cb5d65f05d/doc/langref.html.in"
"url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"lastModified": 1709150264,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github"
},
"original": {
@@ -131,7 +131,6 @@
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"wlroots-src": "wlroots-src",
"zig-overlay": "zig-overlay",
"zls-overlay": "zls-overlay"
}
@@ -151,25 +150,6 @@
"type": "github"
}
},
"wlroots-src": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1700582773,
"narHash": "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "767eedd3cbe9900687bf3b82236320dcd7b77aae",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"ref": "refs/tags/0.17.0",
"repo": "wlroots",
"type": "gitlab"
}
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat",
@@ -179,11 +159,11 @@
]
},
"locked": {
"lastModified": 1703204565,
"narHash": "sha256-A2Wpu3z6cj/zV+QzQ11Zzt3nAtqat0Qo2lPX8qsB3Wk=",
"lastModified": 1709208548,
"narHash": "sha256-cHzhHGJ2mT11mta+JOVNURSG5MdNJrBsDowVIj5nl2Q=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "b7a0aa41fb33514bc216e2f4a106eeac8dee6775",
"rev": "bfa983b61aa539e64703404f434f77b10d41c37e",
"type": "github"
},
"original": {
@@ -202,11 +182,11 @@
]
},
"locked": {
"lastModified": 1701390337,
"narHash": "sha256-C+Lyio+GPl3B2IAZ6Nk5hAAE2g6a8bO9vMACUfOLC/g=",
"lastModified": 1709035693,
"narHash": "sha256-ac5fR8n4RPjP5GHhFMdtUhdL6e/eFCxIOO+7UoP1B/g=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "1815ef2d0451b1121a6a91051da84906fcb06f99",
"rev": "e1c418c2315adaeca6f27fd8919141eb7992866d",
"type": "github"
},
"original": {
@@ -226,11 +206,11 @@
"zig-overlay": "zig-overlay_2"
},
"locked": {
"lastModified": 1703036566,
"narHash": "sha256-GKw+ON8FcUVHxDzA35piev/W/YUvXv5aZ4hmIzNFWuc=",
"lastModified": 1709179266,
"narHash": "sha256-BdofpXMQlk82nzHC7+rK7pOEIO5lSCco7IV2Hyb2OIE=",
"owner": "zigtools",
"repo": "zls",
"rev": "adaeabbe1ba888d74309d0a837d4abddc24cf638",
"rev": "7d6a9e22a27b9f432d85a48db2e0180d15a87fa2",
"type": "github"
},
"original": {
flake.nix
+3 -25
View File
@@ -8,21 +8,11 @@
zls-overlay.url = "github:zigtools/zls";
zls-overlay.inputs.nixpkgs.follows = "nixpkgs";
wlroots-src = {
type = "gitlab";
host = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
ref = "refs/tags/0.17.0";
flake = false;
};
};
outputs = {
self,
nixpkgs,
wlroots-src,
zig-overlay,
zls-overlay,
}: let
@@ -40,19 +30,7 @@
});
in {
overlay = final: prev:
with final; rec {
wlroots = prev.wlroots.overrideAttrs (old: {
version = wlroots-src.shortRev or "dirty";
src = wlroots-src;
buildInputs =
old.buildInputs
++ [
hwdata
libliftoff
libdisplay-info
];
});
with final; {
gaze = with final;
final.callPackage ({inShell ? false}:
stdenv.mkDerivation rec {
@@ -66,8 +44,8 @@
buildInputs =
[
zig-overlay.packages.${system}.master
wlroots
zig-overlay.packages.${system}.master-2024-01-02
wlroots_0_17
libGL
libevdev
libinput