Flake: Add patch to fix nixpkgs-unstable grup install script
This commit is contained in:
parent
d0a38fbfa3
commit
36d0ee851e
2 changed files with 27 additions and 2 deletions
|
|
@ -100,7 +100,9 @@
|
|||
nixpkgs-unstable-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
||||
name = "patched-nixpkgs-unstable";
|
||||
src = nixpkgs-unstable-raw;
|
||||
patches = [];
|
||||
patches = [
|
||||
./nixpkgs_patches/pr383269.patch
|
||||
];
|
||||
};
|
||||
nixpkgs-patched = nixpkgs-raw.legacyPackages.x86_64-linux.applyPatches {
|
||||
name = "patched-nixpkgs";
|
||||
|
|
@ -172,7 +174,8 @@
|
|||
then home-manager
|
||||
else home-manager-unstable
|
||||
)
|
||||
.nixosModules.home-manager
|
||||
.nixosModules
|
||||
.home-manager
|
||||
(
|
||||
if stable
|
||||
then nix-index-db
|
||||
|
|
|
|||
22
nixpkgs_patches/pr383269.patch
Normal file
22
nixpkgs_patches/pr383269.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
From 39dd19122fdabf519c256796df0ed998515990a6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Wed, 19 Feb 2025 14:33:33 +0700
|
||||
Subject: [PATCH] install-grub: add missing rmtree
|
||||
|
||||
---
|
||||
nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
|
||||
index 4a588a75da147..f5ae844da21f9 100644
|
||||
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
|
||||
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
|
||||
@@ -3,7 +3,7 @@
|
||||
use Class::Struct;
|
||||
use XML::LibXML;
|
||||
use File::Basename;
|
||||
-use File::Path qw(make_path);
|
||||
+use File::Path qw(make_path rmtree);
|
||||
use File::stat;
|
||||
use File::Copy;
|
||||
use File::Copy::Recursive qw(rcopy pathrm);
|
||||
Loading…
Add table
Add a link
Reference in a new issue