megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update

Browse source
This commit is contained in:
Malte Tammena 2021-10-30 16:28:48 +02:00
parent cd9809650c
commit e2187ea53a
4 changed files with 68 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
flake.lock
View file

@ -18,11 +18,11 @@
},
"cachix": {
"locked": {
"lastModified": 1632291606,
"narHash": "sha256-oEN24XJYAFK9tsD13TzLEizpgQigEfgC6i9x1b/1pVU=",
"lastModified": 1635373256,
"narHash": "sha256-6QERROygyZN2itA2JUZzhf+o2jfqd6ykJZHQcCAE0r4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "83413f47809790e4ca012e314e7782adeae36cf2",
"rev": "d14d83a3691121642be1b0579cf3408a83c558d7",
"type": "github"
},
"original": {
@ -35,11 +35,11 @@
"cataclysm-dda": {
"flake": false,
"locked": {
"lastModified": 1632719751,
"narHash": "sha256-nXb/kXDLbNgo5T1EsRcHkhvlVWBkPfLrEdAqlAEuhrU=",
"lastModified": 1635571727,
"narHash": "sha256-R/xiSEYCQQXLP+i5RGMNdyFPOvgUk2xvf0p4lsATXBM=",
"owner": "CleverRaven",
"repo": "Cataclysm-DDA",
"rev": "dbfb2479810a28d1adb26f960c5eebea5cc5cd42",
"rev": "150bb486b9fbfdfe9e406ac387e7cc7813e26635",
"type": "github"
},
"original": {
@ -65,11 +65,11 @@
},
"devshell": {
"locked": {
"lastModified": 1632436039,
"narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
"lastModified": 1634850494,
"narHash": "sha256-8bD1CgAJovKjb88I9F/Lxa2Q9VdZBEJYX5rUqHHbaP4=",
"owner": "numtide",
"repo": "devshell",
"rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
"rev": "d36e4ba27668f1620a5adebf5e0c724213a0f157",
"type": "github"
},
"original": {
@ -106,11 +106,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1634092455,
"narHash": "sha256-4XTZy8CzT2Sc+CppuaLZAsqvt+H7cPn2I3ckE6ymIrE=",
"lastModified": 1635601111,
"narHash": "sha256-+UWu41BL713+zPBA1YunLto8uPLvBWqMqb/HrK0Glug=",
"owner": "nix-community",
"repo": "fenix",
"rev": "f1c6e456ca311b5363787038ac0f0d9046e41a94",
"rev": "1c1a6cd1d091d11ba2ccda42e758a08e47dd0d59",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
"rust-analyzer-src": "rust-analyzer-src_2"
},
"locked": {
"lastModified": 1634092455,
"narHash": "sha256-4XTZy8CzT2Sc+CppuaLZAsqvt+H7cPn2I3ckE6ymIrE=",
"lastModified": 1635315838,
"narHash": "sha256-59un+9LZogbhE4z4eJsZm6C2ZsoJLWjsgrPH+NAOH98=",
"owner": "nix-community",
"repo": "fenix",
"rev": "f1c6e456ca311b5363787038ac0f0d9046e41a94",
"rev": "ca0610dbd3a8a575ea0e33c61a6de23ab91a2e01",
"type": "github"
},
"original": {
@ -174,11 +174,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1632431340,
"narHash": "sha256-9xUnx5aeDp8Irg2/rWBKn3AjiiQTtsjTX0UshzMXy94=",
"lastModified": 1635522650,
"narHash": "sha256-9tDPrrPSszMYvdub0sh39e4/0MSomvqQvDjlm3xGH6c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b0651cc2173427857b172604f85da6afe69e1d41",
"rev": "bc0acdad8c001843d4e22cfa20a6ce84b462ab19",
"type": "github"
},
"original": {
@ -193,11 +193,11 @@
"nixCargoIntegration": "nixCargoIntegration"
},
"locked": {
"lastModified": 1634158146,
"narHash": "sha256-+9zdds4yw1WHW41S9M1/sty65rCTTiauoOTFHrzb0D8=",
"lastModified": 1635345428,
"narHash": "sha256-n9eHIKR2HkAO9ndpyqcDBjukAt1gdxweb88Q43qf8eg=",
"owner": "MalteT",
"repo": "mensa",
"rev": "34fa98188f882301057fe649dbb2e4bbb9048093",
"rev": "c6edc88195c504095f4aafcece1dc7de30f33a25",
"type": "github"
},
"original": {
@ -248,11 +248,11 @@
"rustOverlay": "rustOverlay"
},
"locked": {
"lastModified": 1634105392,
"narHash": "sha256-EFwL0AXZdj8W70u3RvAOTP4s+8SbbRjPKrKo9RPlwt8=",
"lastModified": 1635314988,
"narHash": "sha256-qCpnM+H20mJeRCEoz/Ywosr7QEGAqcaZYRRicj2vYac=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "bfd608c07203fd542671ec8c1dc7db6b727f14e9",
"rev": "98e845ae7b15689bf2c6883b5ec15bca834c433d",
"type": "github"
},
"original": {
@ -263,11 +263,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1632267580,
"narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=",
"lastModified": 1635449388,
"narHash": "sha256-i7hMiAgpRTGsMPTQKuNCDfW/ftQ+g9N6iaMj+RN6yws=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "3cc8c47af31798040ea62499090540413279f832",
"rev": "518b9c2159e7d4b7696ee18b8828f9086012923b",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1632747290,
"narHash": "sha256-HhdPC3EuXRkT3gShxAcoZeOp/Q5O6HG7RIxc9MFHi1s=",
"lastModified": 1635603916,
"narHash": "sha256-wUo46ZmLPP0KODRvRFLGe/ilbd6NF0xZUnNzKeToz9o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c553f34417c3080c42dfaa40d75912c15ae989e7",
"rev": "ffcff898a6b7e7875f506ed2f5127a9e57997c13",
"type": "github"
},
"original": {
@ -311,11 +311,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1632750007,
"narHash": "sha256-ZEwnFokZw5OpT1GEp079KxhOoqP6pQ6NlWsR33CziYQ=",
"lastModified": 1635416910,
"narHash": "sha256-B3HGerp1yiK7Jz9MB/DXGuvsVFuNHTRThdzpGDgwFRw=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "9808ae28b3d5a8388a7e4abf8e9560674d80f7a3",
"rev": "6c42fa0314611ac972ff16759a9f9ecbb239fd29",
"type": "github"
},
"original": {
@ -341,11 +341,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1633791597,
"narHash": "sha256-HzpxqTEnqsjkKWfW87kSI3WVizYjUMQeUjSIm3b5I0Y=",
"lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9bf75dd50b7b6d3ce6aaf6563db95f41438b9bdb",
"rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "github"
},
"original": {
@ -357,10 +357,10 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1631381596,
"narHash": "sha256-Xk91RO0uMyul8fWo3RP7WqEP5bsKUVucJRgLZgascAo=",
"path": "/nix/store/c8xp0yrqs7rpiq5yyxwmm7g3wn8mlxwd-source",
"rev": "f6e9e908ccbcabb365cb5434a4a38dd8c996fc72",
"lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"path": "/nix/store/8m51fq11k6nrgvqiphjxrdgy701bmpzm-source",
"rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "path"
},
"original": {
@ -370,11 +370,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1633791597,
"narHash": "sha256-HzpxqTEnqsjkKWfW87kSI3WVizYjUMQeUjSIm3b5I0Y=",
"lastModified": 1634782485,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9bf75dd50b7b6d3ce6aaf6563db95f41438b9bdb",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
"type": "github"
},
"original": {
@ -386,11 +386,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1633791597,
"narHash": "sha256-HzpxqTEnqsjkKWfW87kSI3WVizYjUMQeUjSIm3b5I0Y=",
"lastModified": 1634782485,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9bf75dd50b7b6d3ce6aaf6563db95f41438b9bdb",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
"type": "github"
},
"original": {
@ -402,11 +402,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1632660378,
"narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
"lastModified": 1635403963,
"narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
"rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "github"
},
"original": {
@ -417,11 +417,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1632411313,
"narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=",
"lastModified": 1635314702,
"narHash": "sha256-/CEuEaXFVl2vQ+o3lYzDPz4lfbHbMebyJqQ4jZ1PT30=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed",
"rev": "a4bf44345706231f9dd56f85757499af1e940847",
"type": "github"
},
"original": {
@ -486,11 +486,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1634066987,
"narHash": "sha256-YgoOqnB0OrplGOK5PEmedZp4ucgN6Ax6MxCbQrhVK4Y=",
"lastModified": 1635274542,
"narHash": "sha256-Cew1/WUozM3jalItPuj4cNN8GIFMvCaJ1KXoj6wrHwE=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "137ac67f5dd10d8a5e83e9eeb7600993e9886c8a",
"rev": "dd43f3f2d13a32199828e758ddf13176df1f17f9",
"type": "github"
},
"original": {
@ -503,11 +503,11 @@
"rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1634066987,
"narHash": "sha256-YgoOqnB0OrplGOK5PEmedZp4ucgN6Ax6MxCbQrhVK4Y=",
"lastModified": 1635274542,
"narHash": "sha256-Cew1/WUozM3jalItPuj4cNN8GIFMvCaJ1KXoj6wrHwE=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "137ac67f5dd10d8a5e83e9eeb7600993e9886c8a",
"rev": "dd43f3f2d13a32199828e758ddf13176df1f17f9",
"type": "github"
},
"original": {
@ -539,11 +539,11 @@
"rustOverlay": {
"flake": false,
"locked": {
"lastModified": 1634091531,
"narHash": "sha256-ioiuB96srF9SbpmG4E/VF8+EiT7cMxmo1U0S63kMJHk=",
"lastModified": 1635300835,
"narHash": "sha256-bYcSZCcV5wvqCCcEquYUnOA8Mn2wUwcAQEZ4kPlNVSw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "59d77150c943a1e1377f94be1379c12349345e61",
"rev": "dbedcf48f0a145a9e4b110461d7cd07f97b68285",
"type": "github"
},
"original": {
@ -555,11 +555,11 @@
"sway": {
"flake": false,
"locked": {
"lastModified": 1632597711,
"narHash": "sha256-Y50G947LD+0bnRZRjeFsI9aNaD2hnRh/ioi9UUAXb0M=",
"lastModified": 1635603575,
"narHash": "sha256-icMANs80I5sPTJbZ3iTpwGd7Z5XZ+WkGaH1earSN4kc=",
"owner": "swaywm",
"repo": "sway",
"rev": "5fd5d6434e9ebbc453dde33bf58fea931ea2975a",
"rev": "38020d157ddb58e756c654e9a2ff203c1562b25b",
"type": "github"
},
"original": {
@ -586,11 +586,11 @@
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1632494006,
"narHash": "sha256-mWGKyWnozQJcaHzwCRoikjW3KlwPGTUltJ20QE3HKK0=",
"lastModified": 1635512597,
"narHash": "sha256-lW1DiJAWrdan0by4NzIqhwnXdCKtWLiNXXp8lYjweH0=",
"owner": "swaywm",
"repo": "wlroots",
"rev": "d96d2f5f23e1096ed70dbbf286d5f9480957f667",
"rev": "83090de0340e020c75cca9f28e74cf5413dabd04",
"type": "github"
},
"original": {

2
malte/sway.nix
View file

@ -100,8 +100,8 @@ in {
];
wayland.windowManager.sway = {
extraOptions = [ "--my-next-gpu-wont-be-nvidia" ];
enable = true;
extraOptions = [ "--unsupported-gpu" ];
systemdIntegration = true;
wrapperFeatures = {
base = true;

1
overlays/cataclysm-dda.nix
View file

@ -9,6 +9,5 @@ in {
sha256 = lock.nodes.cataclysm-dda.locked.narHash;
}).overrideAttrs (old: {
enableParallelBuilding = true;
patches = (old.patches or [ ]) ++ [ ../patches/cdda-wayland-sdl-fix.patch ];
});
}

17
patches/cdda-wayland-sdl-fix.patch
View file

@ -1,17 +0,0 @@
diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
index d7a68d65d0..eef7bef83e 100644
--- a/src/sdltiles.cpp
+++ b/src/sdltiles.cpp
@@ -545,11 +545,11 @@ void refresh_display()
// Select default target (the window), copy rendered buffer
// there, present it, select the buffer as target again.
SetRenderTarget( renderer, nullptr );
+ RenderClear( renderer );
#if defined(__ANDROID__)
SDL_Rect dstrect = get_android_render_rect( TERMINAL_WIDTH * fontwidth,
TERMINAL_HEIGHT * fontheight );
SetRenderDrawColor( renderer, 0, 0, 0, 255 );
- RenderClear( renderer );
RenderCopy( renderer, display_buffer, NULL, &dstrect );
#else
RenderCopy( renderer, display_buffer, nullptr, nullptr );