summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndré Vitor de Lima Matos <andre.vmatos@gmail.com>2021-08-02 17:42:47 +0000
committerGitHub <noreply@github.com>2021-08-02 13:42:47 -0400
commit3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90 (patch)
tree7dedc62f560127a8e305486e31d47404ca06affd /pkgs
parentf73b3543b5113c2fee419ec903864503ecb10b1a (diff)
downloadnixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar.gz
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar.bz2
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar.lz
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar.xz
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.tar.zst
nixpkgs-3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90.zip
nvidia_x11: fix suspend script paths since 470.57.02 (#131838)
nvidia 470.57.02 changed the path of `nvidia-sleep.sh` and systemd
scripts, making `builder.sh` miss them and suspend-to-ram on systems
where `hardware.nvidia.powerManagement.enable = true` is set fail.
Diffstat (limited to 'pkgs')
-rwxr-xr-xpkgs/os-specific/linux/nvidia-x11/builder.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index e6ad62b1128..448e91986fc 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -46,11 +46,17 @@ installPhase() {
     fi
 
     # Install systemd power management executables
+    if [ -e systemd/nvidia-sleep.sh ]; then
+        mv systemd/nvidia-sleep.sh ./
+    fi
     if [ -e nvidia-sleep.sh ]; then
         sed -E 's#(PATH=).*#\1"$PATH"#' nvidia-sleep.sh > nvidia-sleep.sh.fixed
         install -Dm755 nvidia-sleep.sh.fixed $out/bin/nvidia-sleep.sh
     fi
 
+    if [ -e systemd/system-sleep/nvidia ]; then
+        mv systemd/system-sleep/nvidia ./
+    fi
     if [ -e nvidia ]; then
         sed -E "s#/usr(/bin/nvidia-sleep.sh)#$out\\1#" nvidia > nvidia.fixed
         install -Dm755 nvidia.fixed $out/lib/systemd/system-sleep/nvidia