diff --git a/flake.nix b/flake.nix index 0b7bae9..83cbdee 100644 --- a/flake.nix +++ b/flake.nix @@ -99,6 +99,8 @@ name = "patched-nixpkgs-unstable"; src = nixpkgs-unstable-raw; patches = [ + ./nixpkgs-patches/kinfocenter-preserve-argv0.patch + ./nixpkgs-patches/pr390197.patch ]; }; nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches { diff --git a/nixpkgs-patches/kinfocenter-preserve-argv0.patch b/nixpkgs-patches/kinfocenter-preserve-argv0.patch new file mode 100644 index 0000000..ef96709 --- /dev/null +++ b/nixpkgs-patches/kinfocenter-preserve-argv0.patch @@ -0,0 +1,13 @@ +diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix +index d9a0c171dbdb..fb337f4fabdc 100644 +--- a/pkgs/kde/plasma/kinfocenter/default.nix ++++ b/pkgs/kde/plasma/kinfocenter/default.nix +@@ -67,6 +67,8 @@ mkKdeDerivation { + ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter + ''; + ++ qtWrapperArgs = [ "--inherit-argv0" ]; ++ + # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically + postFixup = '' + mkdir -p $out/nix-support diff --git a/nixpkgs-patches/pr390197.patch b/nixpkgs-patches/pr390197.patch new file mode 100644 index 0000000..77cfa72 --- /dev/null +++ b/nixpkgs-patches/pr390197.patch @@ -0,0 +1,25 @@ +From 6c12682c6d2e822dcabf3a016124de0a86214053 Mon Sep 17 00:00:00 2001 +From: K900 +Date: Sat, 15 Mar 2025 20:33:34 +0300 +Subject: [PATCH] kdePackages.plasma-workspace: wrap with --inherit-argv0 + +kcminit_startup checks its own argv[0] to determine what mode to run in. + +Fixes #390179. +--- + pkgs/kde/plasma/plasma-workspace/default.nix | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix +index a5b80f8ab351f6..b5a8b5d3657f6c 100644 +--- a/pkgs/kde/plasma/plasma-workspace/default.nix ++++ b/pkgs/kde/plasma/plasma-workspace/default.nix +@@ -62,6 +62,8 @@ mkKdeDerivation { + gpsd + ]; + ++ qtWrapperArgs = [ "--inherit-argv0" ]; ++ + # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically + postFixup = '' + mkdir -p $out/nix-support