forked from DGNum/infrastructure
fix(krz01): apply a correctness patch on proxmox-nixos
To make CI happy. Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
This commit is contained in:
parent
9bc651db42
commit
62b36ed124
2 changed files with 61 additions and 0 deletions
54
patches/05-pmnos-correctness-build-directory.patch
Normal file
54
patches/05-pmnos-correctness-build-directory.patch
Normal file
|
@ -0,0 +1,54 @@
|
|||
From 4d6e57d2d577cc105c9e0cd397408e9e3ce85cd0 Mon Sep 17 00:00:00 2001
|
||||
From: Raito Bezarius <masterancpp@gmail.com>
|
||||
Date: Tue, 8 Oct 2024 16:33:14 +0200
|
||||
Subject: [PATCH] fix(packaging): correctness of the build top directory
|
||||
|
||||
It was using /build which is an implementation detail and not
|
||||
guaranteed.
|
||||
|
||||
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
|
||||
---
|
||||
pkgs/pve-container/default.nix | 6 +++---
|
||||
pkgs/pve-rs/default.nix | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkgs/pve-container/default.nix b/pkgs/pve-container/default.nix
|
||||
index 445c271..5633c0f 100644
|
||||
--- a/pkgs/pve-container/default.nix
|
||||
+++ b/pkgs/pve-container/default.nix
|
||||
@@ -30,7 +30,7 @@ perl536.pkgs.toPerlModule (
|
||||
postPatch = ''
|
||||
sed -i Makefile \
|
||||
-e "s/pct.1 pct.conf.5 pct.bash-completion pct.zsh-completion //" \
|
||||
- -e "s,/usr/share/lxc,/build/lxc," \
|
||||
+ -e "s,/usr/share/lxc,$NIX_BUILD_TOP/lxc," \
|
||||
-e "/pve-doc-generator/d" \
|
||||
-e "/PVE_GENERATING_DOCS/d" \
|
||||
-e "/SERVICEDIR/d" \
|
||||
@@ -45,8 +45,8 @@ perl536.pkgs.toPerlModule (
|
||||
dontPatchShebangs = true;
|
||||
|
||||
postConfigure = ''
|
||||
- cp -r ${lxc}/share/lxc /build
|
||||
- chmod -R +w /build/lxc
|
||||
+ cp -r ${lxc}/share/lxc $NIX_BUILD_TOP/
|
||||
+ chmod -R +w $NIX_BUILD_TOP/lxc
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
diff --git a/pkgs/pve-rs/default.nix b/pkgs/pve-rs/default.nix
|
||||
index c024287..881beab 100644
|
||||
--- a/pkgs/pve-rs/default.nix
|
||||
+++ b/pkgs/pve-rs/default.nix
|
||||
@@ -57,7 +57,7 @@ perl536.pkgs.toPerlModule (
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
- "BUILDIR=/build"
|
||||
+ "BUILDIR=$NIX_BUILD_TOP"
|
||||
"BUILD_MODE=release"
|
||||
"DESTDIR=$(out)"
|
||||
"GITVERSION:=${src.rev}"
|
||||
--
|
||||
2.46.0
|
||||
|
|
@ -126,4 +126,11 @@ in
|
|||
hash = "sha256-SgHhW9HCkDQsxT3eG4P9q68c43e3sbDHRY9qs7oSt8o=";
|
||||
}
|
||||
];
|
||||
|
||||
"proxmox-nixos" = [
|
||||
{
|
||||
_type = "static";
|
||||
path = ./05-pmnos-correctness-build-directory.patch;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue