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

nix: comment out libkrun(fw) source overrides

Browse source 
As we're currently using entirely upstream ones right now. Let's reuse
the cache.nixos.org builds.
This commit is contained in:
Val Packett 2026-02-07 00:21:36 -03:00
parent 9708e5fb64
commit 09f1eb76de
4 changed files with 58 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -20,40 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"libkrun-src": {
"flake": false,
"locked": {
"lastModified": 1767965092,
"narHash": "sha256-6HBSL5Zu29sDoEbZeQ6AsNIXUcqXVVGMk0AR2X6v1yU=",
"owner": "containers",
"repo": "libkrun",
"rev": "376f25637c49f26231ec92532f31a24b99236aa6",
"type": "github"
},
"original": {
"owner": "containers",
"repo": "libkrun",
"rev": "376f25637c49f26231ec92532f31a24b99236aa6",
"type": "github"
}
},
"libkrunfw-src": {
"flake": false,
"locked": {
"lastModified": 1765874399,
"narHash": "sha256-x9HQP+EqCteoCq2Sl/TQcfdzQC5iuE4gaSKe7tN5dAA=",
"owner": "containers",
"repo": "libkrunfw",
"rev": "20484a2e60290acb74c43ccfd6e1ea4caf41d470",
"type": "github"
},
"original": {
"owner": "containers",
"repo": "libkrunfw",
"rev": "20484a2e60290acb74c43ccfd6e1ea4caf41d470",
"type": "github"
}
},
"muvm-src": { "muvm-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -90,8 +56,6 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"libkrun-src": "libkrun-src",
"libkrunfw-src": "libkrunfw-src",
"muvm-src": "muvm-src", "muvm-src": "muvm-src",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sidebus": "sidebus" "sidebus": "sidebus"

24
flake.nix
View file

@ -19,14 +19,14 @@
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:containers/libkrun/376f25637c49f26231ec92532f31a24b99236aa6"; # v1.17.0
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;
}; # };
}; };
outputs = outputs =
@ -36,8 +36,8 @@
flake-parts, flake-parts,
sidebus, sidebus,
muvm-src, muvm-src,
libkrun-src, # libkrun-src,
libkrunfw-src, # libkrunfw-src,
... ...
}: }:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
@ -103,12 +103,12 @@
# Packages support variant parameter: null (default), "sev", or "tdx" # Packages support variant parameter: null (default), "sev", or "tdx"
# To build a variant: packages.libkrunfw.override { variant = "sev"; } # To build a variant: packages.libkrunfw.override { variant = "sev"; }
libkrunfw = pkgs.callPackage ./packages/libkrunfw { libkrunfw = pkgs.callPackage ./packages/libkrunfw {
libkrunfw-src = libkrunfw-src; # libkrunfw-src = libkrunfw-src;
}; };
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 { };

40
packages/libkrun/default.nix
View file

@ -1,18 +1,30 @@
{ libkrun, libkrunfw, libkrun-src, rustPlatform, variant ? null, ... }: {
libkrun,
libkrunfw,
# libkrun-src,
# rustPlatform,
variant ? null,
...
}:
let let
libkrunfw' = libkrunfw.override { inherit variant; }; libkrunfw' = libkrunfw.override { inherit variant; };
in libkrun' = libkrun.override {
(libkrun.override { withBlk = true;
withBlk = true; withNet = true;
withGpu = true; withGpu = true;
withSound = true; # --- stick to the override used in nixpkgs' muvm package to reuse nixos.org cache when not overriding src ---
withNet = true; # withSound = true; # not for pipewire forwarding, anyway
inherit variant; # withTimesync = true; # why not?..
libkrunfw = libkrunfw'; # ---------
}).overrideAttrs (old: { inherit variant;
src = libkrun-src; libkrunfw = libkrunfw';
cargoDeps = rustPlatform.importCargoLock {
lockFile = "${libkrun-src}/Cargo.lock";
}; };
}) in
libkrun'
# libkrun'.overrideAttrs (old: {
# src = libkrun-src;
# cargoDeps = rustPlatform.importCargoLock {
# lockFile = "${libkrun-src}/Cargo.lock";
# };
# })

30
packages/libkrunfw/default.nix
View file

@ -1,12 +1,22 @@
{ libkrunfw, libkrunfw-src, fetchurl, variant ? null, ... }: {
libkrunfw,
# libkrunfw-src,
# fetchurl,
variant ? null,
...
}:
(libkrunfw.override { let
inherit variant; libkrunfw' = libkrunfw.override {
}).overrideAttrs (old: { inherit variant;
version = "5.1.0";
src = libkrunfw-src;
kernelSrc = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz";
hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM=";
}; };
}) in
libkrunfw'
# libkrunfw'.overrideAttrs (old: {
# version = "5.1.0";
# src = libkrunfw-src;
# kernelSrc = fetchurl {
# url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz";
# hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM=";
# };
# })