Unverified Commit 0251efb9 authored by Bart Oostveen's avatar Bart Oostveen
Browse files

rpm-ostree: 2024.8 -> 2026.1 

This also fixes the broken build. (Hydra job: https://hydra.nixos.org/build/326900030)
parent 9259b830

pkgs/by-name/rp/rpm-ostree/package.nix

+6 −3
Original line number Diff line number Diff line
@@ -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 = ''