nix: comment out libkrun(fw) source overrides

As we're currently using entirely upstream ones right now. Let's reuse
the cache.nixos.org builds.

flake.lock

@@ -20,40 +20,6 @@
         "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": {
       "flake": false,
       "locked": {
@@ -90,8 +56,6 @@
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "libkrun-src": "libkrun-src",
-        "libkrunfw-src": "libkrunfw-src",
         "muvm-src": "muvm-src",
         "nixpkgs": "nixpkgs",
         "sidebus": "sidebus"

flake.nix

@@ -19,14 +19,14 @@
       url = "github:valpackett/muvm/ae7dbd49aac04e9732a14a424572e99a81eb1298"; # v0.5.0+custom-init
       flake = false;
     };
-    libkrun-src = {
-      url = "github:containers/libkrun/376f25637c49f26231ec92532f31a24b99236aa6"; # v1.17.0
-      flake = false;
-    };
-    libkrunfw-src = {
-      url = "github:containers/libkrunfw/20484a2e60290acb74c43ccfd6e1ea4caf41d470"; # v5.1.0
-      flake = false;
-    };
+    # libkrun-src = {
+    #   url = "github:containers/libkrun/376f25637c49f26231ec92532f31a24b99236aa6"; # v1.17.0
+    #   flake = false;
+    # };
+    # libkrunfw-src = {
+    #   url = "github:containers/libkrunfw/20484a2e60290acb74c43ccfd6e1ea4caf41d470"; # v5.1.0
+    #   flake = false;
+    # };
   };
 
   outputs =
@@ -36,8 +36,8 @@
       flake-parts,
       sidebus,
       muvm-src,
-      libkrun-src,
-      libkrunfw-src,
+      # libkrun-src,
+      # libkrunfw-src,
       ...
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
@@ -103,12 +103,12 @@
             # Packages support variant parameter: null (default), "sev", or "tdx"
             # To build a variant: packages.libkrunfw.override { variant = "sev"; }
             libkrunfw = pkgs.callPackage ./packages/libkrunfw {
-              libkrunfw-src = libkrunfw-src;
+              # libkrunfw-src = libkrunfw-src;
             };
 
             libkrun = pkgs.callPackage ./packages/libkrun {
               libkrunfw = self'.packages.libkrunfw;
-              libkrun-src = libkrun-src;
+              # libkrun-src = libkrun-src;
             };
 
             mesa = pkgs.callPackage ./packages/mesa { };

packages/libkrun/default.nix

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

packages/libkrunfw/default.nix

@@ -1,12 +1,22 @@
-{ libkrunfw, libkrunfw-src, fetchurl, variant ? null, ... }:
+{
+  libkrunfw,
+  # libkrunfw-src,
+  # fetchurl,
+  variant ? null,
+  ...
+}:
 
-(libkrunfw.override {
-  inherit variant;
-}).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=";
+let
+  libkrunfw' = libkrunfw.override {
+    inherit variant;
   };
-})
+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=";
+#   };
+# })