From 0251efb9df705d8d14ea3fec8223b594a6c90952 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Mon, 4 May 2026 15:57:51 +0200
Subject: [PATCH] rpm-ostree: 2024.8 -> 2026.1

This also fixes the broken build. (Hydra job: https://hydra.nixos.org/build/326900030)
---
 pkgs/by-name/rp/rpm-ostree/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix
index f700f0963bdd..2692782f7cd6 100644
--- a/pkgs/by-name/rp/rpm-ostree/package.nix
+++ b/pkgs/by-name/rp/rpm-ostree/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpm-ostree";
-  version = "2024.8";
+  version = "2026.1";
 
   outputs = [
     "out"
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/coreos/rpm-ostree/releases/download/v${finalAttrs.version}/rpm-ostree-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6aCGP3SJ0DegmhiQkiqBr733C5vuDGTjLMaxNtai3G0=";
+    hash = "sha256-/dgF4jN4Sq7pRFmSMWXmG21y0PlkPPOMf8QhP8CB+yA=";
   };
 
   nativeBuildInputs = [
@@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--enable-gtk-doc"
-    "--with-bubblewrap=${bubblewrap}/bin/bwrap"
   ];
 
   dontUseCmakeConfigure = true;
@@ -115,6 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
     # Let's not hardcode the rpm-gpg path...
     substituteInPlace libdnf/libdnf/dnf-keyring.cpp \
       --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"'
+
+    # Do not try to install in global /usr/lib
+    substituteInPlace Makefile-rpm-ostree.am \
+      --replace '/usr/lib/kernel/install.d' '$(libdir)/kernel/install.d'
   '';
 
   preConfigure = ''