fix: Compatibility with 26.05

5 files changed, 5 insertions, 41 deletions

diff --git a/modules/personal/desktop-media-creation.nix b/modules/personal/desktop-media-creation.nix
index 0c6c945..9838a75 100644
--- a/modules/personal/desktop-media-creation.nix
+++ b/modules/personal/desktop-media-creation.nix
@@ -3,6 +3,6 @@
     inkscape
     krita
     ardour
-    blender-hip
+    pkgsRocm.blender
   ];
 }
diff --git a/overlays/unigine-hash-fixes/default.nix b/overlays/unigine-hash-fixes/default.nix
deleted file mode 100644
index 5c2957e..0000000
--- a/overlays/unigine-hash-fixes/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-final: prev: rec {
-  unigine-heaven = prev.unigine-heaven.overrideAttrs (prevAttrs: {
-    src = builtins.fetchurl {
-      inherit (prevAttrs.src) url;
-      sha256 = "15z3v2ad84wm37pphqk162dwcz0a5i46p4zs5dy1sqnmxmfjxnsj";
-    };
-  });
-  # unigine-superposition isn't a simple derivation, the actual fetcher
-  # is "hidden" behind a let binding in the source code
-  unigine-superposition =
-    let
-      pkgs = import
-        (final.applyPatches {
-            name = "fix-superposition";
-            src = final.path;
-            patches = [
-              ./superposition-hash.patch
-            ];
-          }).out
-        { inherit (final) system; config.allowUnfree = true; };
-    in
-      pkgs.unigine-superposition;
-}
diff --git a/overlays/unigine-hash-fixes/superposition-hash.patch b/overlays/unigine-hash-fixes/superposition-hash.patch
deleted file mode 100644
index 9afa4c1..0000000
--- a/overlays/unigine-hash-fixes/superposition-hash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
-index 8510096d8..14bcbe371 100644
---- a/pkgs/applications/graphics/unigine-superposition/default.nix
-+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
-@@ -37,7 +37,7 @@ let
- 
-     src = fetchurl {
-       url = "https://assets.unigine.com/d/Unigine_Superposition-${version}.run";
--      sha256 = "12hzlz792pf8pvxf13fww3qhahqzwzkxq9q3mq20hbhvaphbg7nd";
-+      sha256 = "1y40wmfrbdjkmiv4k7cjg62bvzwvkp5xbm8k2lbg57pm7g3y353l";
-     };
- 
-     nativeBuildInputs = [
diff --git a/packages/inferno-os/default.nix b/packages/inferno-os/default.nix
index fd741a3..e2f9d8e 100644
--- a/packages/inferno-os/default.nix
+++ b/packages/inferno-os/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    xorg.libX11
-    xorg.libXext
+    libX11
+    libXext
   ];
 
   # TODO: move these changes to a patch
diff --git a/packages/inferno64/default.nix b/packages/inferno64/default.nix
index 7ac353f..2dcd6e1 100644
--- a/packages/inferno64/default.nix
+++ b/packages/inferno64/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    xorg.libX11
-    xorg.libXext
+    libX11
+    libXext
     libpulseaudio
   ];