From 630e634cd27c4551fcd5a562873d215c876d1739 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 3 Apr 2025 18:37:03 +0200 Subject: [PATCH] Flake: remove unneeded patches --- flake.nix | 6 ----- .../kinfocenter-preserve-argv0.patch | 13 ---------- nixpkgs-patches/pr390197.patch | 25 ------------------- 3 files changed, 44 deletions(-) delete mode 100644 nixpkgs-patches/kinfocenter-preserve-argv0.patch delete mode 100644 nixpkgs-patches/pr390197.patch diff --git a/flake.nix b/flake.nix index 83cbdee..2de1703 100644 --- a/flake.nix +++ b/flake.nix @@ -99,18 +99,12 @@ 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 { name = "patched-nixpkgs"; src = nixpkgs-raw; patches = [ - (nixpkgs-raw.legacyPackages.x86_64-linux.fetchpatch { - url = "https://github.com/NixOS/nixpkgs/pull/370713.patch"; - hash = "sha256-gZPP99e42XdYrQz9wWHpS0ChRhK7m9Yitmy7UT5OxiM="; - }) ]; }; # https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26 diff --git a/nixpkgs-patches/kinfocenter-preserve-argv0.patch b/nixpkgs-patches/kinfocenter-preserve-argv0.patch deleted file mode 100644 index ef96709..0000000 --- a/nixpkgs-patches/kinfocenter-preserve-argv0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 77cfa72..0000000 --- a/nixpkgs-patches/pr390197.patch +++ /dev/null @@ -1,25 +0,0 @@ -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