From 700de31afef026dce6e3e84d25d5f7e3e6d903f2 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 28 Sep 2025 16:55:34 -0500
Subject: [PATCH 1/2] podman-bootc: drop

---
 pkgs/default.nix              |  1 -
 pkgs/podman-bootc/default.nix | 52 -----------------------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 pkgs/podman-bootc/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8c6d799..9983aa7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -14,7 +14,6 @@ in
   pgdiff = callPackage ./pgdiff { };
   vkv = callPackage ./vkv { };
   quakejs = callPackage ./quakejs { };
-  podman-bootc = callPackage ./podman-bootc { };
   tv-sony = callPackage ./tv-sony { };
   simple-proxy = callPackage ./simple-proxy { };
   dreamm = callPackage ./dreamm { };
diff --git a/pkgs/podman-bootc/default.nix b/pkgs/podman-bootc/default.nix
deleted file mode 100644
index 7912855..0000000
--- a/pkgs/podman-bootc/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  pkg-config,
-  btrfs-progs,
-  libvirt,
-  gpgme,
-  xorriso,
-  lvm2,
-}:
-
-buildGoModule {
-  pname = "podman-bootc";
-  version = "0.1.2-unstable-2025-09-24";
-
-  src = fetchFromGitHub {
-    owner = "containers";
-    repo = "podman-bootc";
-    rev = "16c345a9d58995c4a1585b0d9d73ec106b74c14a";
-    hash = "sha256-jL09FJOgdsCMhhXUE3iTUJORZs++TgtVZjdOM9nU+Rg=";
-  };
-
-  vendorHash = "sha256-8QP4NziLwEo0M4NW5UgSEMAVgBDxmnE+PLbpyclK9RQ=";
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    btrfs-progs
-    libvirt
-    gpgme
-    xorriso
-    lvm2
-  ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A scriptable CLI that offers an efficient and ergonomic \"edit-compile-debug\" cycle for bootable containers";
-    homepage = "https://github.com/containers/podman-bootc";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ devusb ];
-    mainProgram = "podman-bootc";
-  };
-}

From c733733cfb445cac2e2a670392183ae0cb289009 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 28 Sep 2025 17:33:21 -0500
Subject: [PATCH 2/2] dreamm: 3.0.3 -> 4.0b17

---
 pkgs/dreamm/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/dreamm/default.nix b/pkgs/dreamm/default.nix
index ebc6f1b..1651d6d 100644
--- a/pkgs/dreamm/default.nix
+++ b/pkgs/dreamm/default.nix
@@ -3,12 +3,15 @@
   stdenv,
   fetchzip,
   fetchurl,
+  autoAddDriverRunpath,
   autoPatchelfHook,
   makeDesktopItem,
   copyDesktopItems,
   alsa-lib,
   curl,
   SDL2,
+  libgbm,
+  libxcb,
 }:
 
 let
@@ -20,7 +23,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "dreamm";
-  version = "3.0.3";
+  version = "4.0b17";
 
   src =
     let
@@ -31,17 +34,18 @@ stdenv.mkDerivation rec {
         aarch64-linux = "linux-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-lVgt0SVm8ml1nFTDXnXpaYRI+1HDVwtLIztAq+re00E=";
-        aarch64-linux = "sha256-zG/8ie3p9WI7D5ukVp8cQm+zhWysnzQ8qG5vrHIdyLs=";
+        x86_64-linux = "sha256-FY7wCiNv86NeKkV/nB+Ty5yAIO7VClNm3rpRaDqjie8=";
+        aarch64-linux = "";
       };
     in
     fetchzip {
-      url = "https://aarongiles.com/dreamm/releases/dreamm-${version}-${suffix}.tgz";
+      url = "https://aarongiles.com/dreamm/releases/4.0/dreamm-${version}-${suffix}.tgz";
       inherit hash;
       stripRoot = false;
     };
 
   nativeBuildInputs = [
+    autoAddDriverRunpath
     autoPatchelfHook
     copyDesktopItems
   ];
@@ -52,10 +56,14 @@ stdenv.mkDerivation rec {
     SDL2
   ];
 
+  runtimeDependencies = [
+    libgbm
+    libxcb
+  ];
+
   installPhase = ''
     runHook preInstall
     install -D dreamm $out/bin/dreamm
-    install -D mt32emu-dreamm.so $out/bin/mt32emu-dreamm.so
     runHook postInstall
   '';