Flake: remove unneeded patches
This commit is contained in:
parent
f7a528a94f
commit
630e634cd2
3 changed files with 0 additions and 44 deletions
|
|
@ -99,18 +99,12 @@
|
||||||
name = "patched-nixpkgs-unstable";
|
name = "patched-nixpkgs-unstable";
|
||||||
src = nixpkgs-unstable-raw;
|
src = nixpkgs-unstable-raw;
|
||||||
patches = [
|
patches = [
|
||||||
./nixpkgs-patches/kinfocenter-preserve-argv0.patch
|
|
||||||
./nixpkgs-patches/pr390197.patch
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
||||||
name = "patched-nixpkgs";
|
name = "patched-nixpkgs";
|
||||||
src = nixpkgs-raw;
|
src = nixpkgs-raw;
|
||||||
patches = [
|
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
|
# https://discourse.nixos.org/t/proper-way-of-applying-patch-to-system-managed-via-flake/21073/26
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
From 6c12682c6d2e822dcabf3a016124de0a86214053 Mon Sep 17 00:00:00 2001
|
|
||||||
From: K900 <me@0upti.me>
|
|
||||||
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
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue