diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
-rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3fec8d38ac9..2a23c8d3ea5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -758,7 +758,7 @@ let POSIX_MQUEUE = yes; FRONTSWAP = yes; FUSION = yes; # Fusion MPT device support - IDE = no; # deprecated IDE support + IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol 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 |