else/clan-munix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch from git submodules to flake inputs

Browse source
This commit is contained in:
Jörg Thalheim 2025-11-28 16:19:52 +01:00 • committed by Val Packett
parent 6e8e4b9fda
commit 57b8ae3424
9 changed files with 86 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/libkrun/default.nix
View file

@ -1,4 +1,4 @@
{ libkrun, libkrunfw, rustPlatform, variant ? null, ... }:
{ libkrun, libkrunfw, libkrun-src, rustPlatform, variant ? null, ... }:
let
libkrunfw' = libkrunfw.override { inherit variant; };
@ -11,9 +11,8 @@ in
inherit variant;
libkrunfw = libkrunfw';
}).overrideAttrs (old: {
src = ../../libkrun;
src = libkrun-src;
cargoDeps = rustPlatform.importCargoLock {
lockFile = ../../libkrun/Cargo.lock;
lockFile = "${libkrun-src}/Cargo.lock";
};
# mesonFlags = [ (lib.mesonOption "decoders" "gles,vulkan,composer") ]; # no magma(?)
})

11
packages/libkrunfw/default.nix
View file

@ -1,19 +1,12 @@
{ libkrunfw, fetchurl, variant ? null, ... }:
{ libkrunfw, libkrunfw-src, fetchurl, variant ? null, ... }:
(libkrunfw.override {
inherit variant;
}).overrideAttrs (old: {
version = "5.0.0";
src = ../../libkrunfw;
# src = fetchFromGitHub {
# owner = "containers";
# repo = "libkrunfw";
# tag = "v4.10.0";
# hash = "sha256-mq2gw0+xL6qUZE/fk0vLT3PEpzPV8p+iwRFJHXVOMnk=";
# };
src = libkrunfw-src;
kernelSrc = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.44.tar.xz";
hash = "sha256-tlAhDtMCeyJJadFIqjd0Uqmq065/KFGr7dMa3+8Wva4=";
};
# buildInputs = old.buildInputs;
})

6
packages/muvm/default.nix
View file

@ -1,12 +1,12 @@
{ muvm, libkrun, systemd, rustPlatform }:
{ muvm, libkrun, muvm-src, systemd, rustPlatform }:
(muvm.override {
libkrun = libkrun;
}).overrideAttrs (old: {
postPatch = ""; # no more sysctl; udevd now takes the var anyway; XXX: fex
MUVM_UDEVD_PATH = "${systemd}/lib/systemd/systemd-udevd";
src = ../../muvm;
src = muvm-src;
cargoDeps = rustPlatform.importCargoLock {
lockFile = ../../muvm/Cargo.lock;
lockFile = "${muvm-src}/Cargo.lock";
};
})