summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore11
-rw-r--r--flake.nix4
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index b788ee1..b6ca06f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,14 @@
**/build*/
.cache/
compile_commands.json
-subprojects/c89atomic.wrap
+result
subprojects/c89atomic-*/
-subprojects/glfw3.wrap
+subprojects/c89atomic.wrap
subprojects/glfw3-*/
+subprojects/glfw3.wrap
subprojects/glm/
-subprojects/jansson.wrap
subprojects/jansson-*/
+subprojects/jansson.wrap
subprojects/janus/
subprojects/jsmn.wrap
subprojects/jsmn/
@@ -25,8 +26,8 @@ subprojects/s3tc-dxt-decompression/
subprojects/stb/
subprojects/stela
subprojects/stela/
-subprojects/wayland-protocols.wrap
subprojects/wayland-protocols-*/
-subprojects/wlr-protocols.wrap
+subprojects/wayland-protocols.wrap
subprojects/wlr-protocols-*/
+subprojects/wlr-protocols.wrap
workshop_wallpapers*/
diff --git a/flake.nix b/flake.nix
index 1fdd984..b3c6846 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
version = "0.13";
src = fetchgit {
url = "https://git.akon.city/mauri";
- rev = "6996224e019fbfbe94b96bb9e9b3db8bc452ab08";
+ rev = "7ad2cd0d2204bb9f6ec65a2af9a0d4518f5c62d1";
postFetch = ''
export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
@@ -41,7 +41,7 @@
find subprojects -type d -name .git -prune -execdir rm -r {} +
'';
- sha256 = "v6kxLPdAzwulf/5AJhRCiZyuP2sPlcvoPn4s0CpMd6s=";
+ sha256 = "fnbmLaSwD5tPvbrcDGmwqETglrAbESn6b2zuNoUmnyI=";
};
nativeBuildInputs = [
git