nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 03:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkosi: 20.2 -> 21

Browse Source
This commit is contained in:
Paul Meyer 2024-03-19 06:17:12 +00:00
parent 06fc875337
commit 39de88f344
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/virtualization/mkosi/default.nix
View File

@ -45,7 +45,7 @@ let
in
buildPythonApplication rec {
pname = "mkosi";
version = "20.2";
version = "21";
format = "pyproject";
outputs = [ "out" "man" ];
@ -54,22 +54,13 @@ buildPythonApplication rec {
owner = "systemd";
repo = "mkosi";
rev = "v${version}";
hash = "sha256-+mvepzoswDVIHzj+rEnlr0ouphGv5unpaNX3U8x517Y=";
hash = "sha256-ONahHWDPB9EOdqyiogLjrSwdtXidWG0aYXE4F7khg0I=";
};
patches = [
# sandbox: Deal correctly with unmerged-usr.
# Remove on next release after v20.2.
(fetchpatch {
url = "https://github.com/systemd/mkosi/commit/5a708efdb432dee9c6e5a9a4754752359cac8944.patch";
hash = "sha256-dXkY8Hha6y9CoZC1WdtZuI/YJsOQ1fOt4o4RsPkGWYQ=";
})
];
# Fix ctypes finding library
# https://github.com/NixOS/nixpkgs/issues/7307
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace mkosi/run.py \
substituteInPlace mkosi/user.py \
--replace 'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'"
substituteInPlace mkosi/__init__.py \
--replace '/usr/lib/systemd/ukify' "${systemdForMkosi}/lib/systemd/ukify"