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

Fork libkrun again to fix buffer mapping permission issue (fix #18)

Browse source 
Initial D-Bus WIP is also there..
This commit is contained in:
Val Packett 2026-02-20 05:17:28 -03:00
parent adf2d24b60
commit beeb5f5d9f
3 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -20,6 +20,23 @@
"type": "github" "type": "github"
} }
}, },
"libkrun-src": {
"flake": false,
"locked": {
"lastModified": 1772170018,
"narHash": "sha256-pi4Mrx9wFE8zT8lx+0su2bP1tTkJBh5FaGNQjAFUAx4=",
"owner": "valpackett",
"repo": "libkrun",
"rev": "eeafbc55379b60379414168e7a22d5f95b73d7a0",
"type": "github"
},
"original": {
"owner": "valpackett",
"repo": "libkrun",
"rev": "eeafbc55379b60379414168e7a22d5f95b73d7a0",
"type": "github"
}
},
"muvm-src": { "muvm-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -56,6 +73,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"libkrun-src": "libkrun-src",
"muvm-src": "muvm-src", "muvm-src": "muvm-src",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sidebus": "sidebus" "sidebus": "sidebus"

12
flake.nix
View file

@ -19,10 +19,10 @@
url = "github:valpackett/muvm/ae7dbd49aac04e9732a14a424572e99a81eb1298"; # v0.5.0+custom-init url = "github:valpackett/muvm/ae7dbd49aac04e9732a14a424572e99a81eb1298"; # v0.5.0+custom-init
flake = false; flake = false;
}; };
# libkrun-src = { libkrun-src = {
# url = "github:containers/libkrun/376f25637c49f26231ec92532f31a24b99236aa6"; # v1.17.0 url = "github:valpackett/libkrun/eeafbc55379b60379414168e7a22d5f95b73d7a0"; # PR #558 (map permission fix) + D-Bus WIP
# flake = false; flake = false;
# }; };
# libkrunfw-src = { # libkrunfw-src = {
# url = "github:containers/libkrunfw/20484a2e60290acb74c43ccfd6e1ea4caf41d470"; # v5.1.0 # url = "github:containers/libkrunfw/20484a2e60290acb74c43ccfd6e1ea4caf41d470"; # v5.1.0
# flake = false; # flake = false;
@ -36,7 +36,7 @@
flake-parts, flake-parts,
sidebus, sidebus,
muvm-src, muvm-src,
# libkrun-src, libkrun-src,
# libkrunfw-src, # libkrunfw-src,
... ...
}: }:
@ -108,7 +108,7 @@
libkrun = pkgs.callPackage ./packages/libkrun { libkrun = pkgs.callPackage ./packages/libkrun {
libkrunfw = self'.packages.libkrunfw; libkrunfw = self'.packages.libkrunfw;
# libkrun-src = libkrun-src; libkrun-src = libkrun-src;
}; };
mesa = pkgs.callPackage ./packages/mesa { }; mesa = pkgs.callPackage ./packages/mesa { };

20
packages/libkrun/default.nix
View file

@ -1,8 +1,9 @@
{ {
libkrun, libkrun,
libkrunfw, libkrunfw,
# libkrun-src, libkrun-src,
# rustPlatform, rustPlatform,
libcap_ng,
variant ? null, variant ? null,
... ...
}: }:
@ -21,10 +22,11 @@ let
libkrunfw = libkrunfw'; libkrunfw = libkrunfw';
}; };
in in
libkrun' # libkrun'
# libkrun'.overrideAttrs (old: { libkrun'.overrideAttrs (old: {
# src = libkrun-src; src = libkrun-src;
# cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
# lockFile = "${libkrun-src}/Cargo.lock"; lockFile = "${libkrun-src}/Cargo.lock";
# }; };
# }) buildInputs = old.buildInputs ++ [ libcap_ng ]; # new dep
})