Update to NixOS 24.05

2024-06-01 19:58:52 -06:00
parent fd1ead0b62
commit 588e94dcf4
17 changed files with 63 additions and 109 deletions
--- a/patches/esphome.patch
+++ b/patches/esphome.patch
@@ -1,19 +0,0 @@
-diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
-index a8ab91f8f329..81bf135a023f 100644
--- a/pkgs/tools/misc/esphome/default.nix
-+++ b/pkgs/tools/misc/esphome/default.nix
-@@ -5,6 +5,7 @@
- , platformio
- , esptool
- , git
-+, stdenv
- }:
- 
- let
-@@ -76,6 +77,7 @@ python.pkgs.buildPythonApplication rec {
-     # git is used in esphomeyaml/writer.py
-     "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
-     "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages
-+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
-     "--set ESPHOME_USE_SUBPROCESS ''"
-   ];
--- a/patches/gamepadui.patch
+++ b/patches/gamepadui.patch
@@ -6,8 +6,8 @@ index 29c449c16946..f6c728eb7f0c 100644
   in
     pkgs.writeShellScriptBin "steam-gamescope" ''
       ${builtins.concatStringsSep "\n" exports}
-      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
-+      gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
+-      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
+      gamescope --steam ${builtins.toString cfg.gamescopeSession.args} -- steam -gamepadui -steamdeck -pipewire-dmabuf &> /tmp/steamlog
     '';
 
   gamescopeSessionFile =