diff --git a/base.nix b/base.nix
index 5672165..b6139eb 100644
--- a/base.nix
+++ b/base.nix
@@ -3,18 +3,34 @@
   # Remove ZFS
   boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" "ext4" "vfat" ];
 
-  # Awaiting upstream linux-firmware patch
-  # https://lore.kernel.org/all/CADWks+YJm8bi+KPXYTvQ3JrriDW2dcdxfSZ2O5J0vfhfC654Tw@mail.gmail.com/
-  # https://github.com/NixOS/nixpkgs/pull/168826#issuecomment-1152990386
+  # RISC-V Quirks and patches, should be upstreamed
   nixpkgs.overlays = [
     (final: prev: {
-      linux-firmware = prev.linux-firmware.overrideAttrs (old: {
-        postInstall = ''
-          cp $out/lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \
-            $out/lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
-        '';
-        outputHash = null;
+      gusb = prev.gusb.overrideAttrs (old: {
+        buildInputs = old.buildInputs ++ [ prev.gobject-introspection ];
       });
+      colord = prev.colord.overrideAttrs (old: {
+        buildInputs = old.buildInputs ++ [ prev.gobject-introspection ];
+      });
+      cage = prev.cage.overrideAttrs (old: {
+        depsBuildBuild = [ prev.pkg-config ];
+      });
+#      ebook_tools = prev.ebook_tools.overrideAttrs (_old: {
+#        preConfigure = ''
+#          NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $($PKG_CONFIG --cflags libzip)"
+#        '';
+#      });
+      discount = prev.discount.overrideAttrs (_old: {
+        configurePlatforms = [];
+      });
+      sane-backends = prev.sane-backends.overrideAttrs (_old: {
+        CFLAGS = "-DHAVE_MMAP=0";
+      });
+      curl = prev.curl.overrideAttrs (_old: {
+        CFLAGS = "-w";
+        LDFLAGS = "-latomic";
+      });
+      x265 = prev.x265.override { multibitdepthSupport = false; };
     })
   ];