From 4f4753e6d2ce6b4a1d7232785eed985d26a1ed46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Fri, 11 Apr 2025 01:08:21 +0200
Subject: [PATCH] libkrun: 1.9.8 -> 1.11.2

---
 pkgs/by-name/li/libkrun/package.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix
index 9ab6637a4778..3f8f2c4e3895 100644
--- a/pkgs/by-name/li/libkrun/package.nix
+++ b/pkgs/by-name/li/libkrun/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libkrun";
-  version = "1.9.8";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libkrun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a5ot5ad8boANK3achn6PJ52k/xmxawbTM0/hEEC/fss=";
+    hash = "sha256-B11f7uG/oODwkME2rauCFbVysxUtUrUmd6RKeuBdnUU=";
   };
 
   outputs = [
@@ -38,9 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-X1NPZQaXFBw9IKD2DbBCPug0WDjv8XnpefbA2RNJgFU=";
+    hash = "sha256-bcHy8AfO9nzSZKoFlEpPKvwupt3eMb+A2rHDaUzO3/U=";
   };
 
+  # Make sure libkrunfw can be found by dlopen()
+  # FIXME: This wasn't needed previously. What changed?
+  env.RUSTFLAGS = toString (
+    map (flag: "-C link-arg=" + flag) [
+      "-Wl,--push-state,--no-as-needed"
+      "-lkrunfw"
+      "-Wl,--pop-state"
+    ]
+  );
+
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     rustPlatform.bindgenHook