From 4d63ecabd35c4e2fbcc1f7b9d89917e22f2ea45b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 17:42:44 +0100
Subject: [PATCH 1/2] linuxPackages.shufflecake: use wrapped gcc compiler

---
 pkgs/os-specific/linux/shufflecake/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index 6871364183b5..f8bda2bcfd5b 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -23,12 +23,16 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     lvm2
   ];
-  makeFlags = kernelModuleMakeFlags ++ [
-    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  # GCC 14 makes this an error by default, remove when fixed upstream
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  makeFlags =
+    kernelModuleMakeFlags
+    ++ [
+      "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ]
+    # Use wrapped gcc compiler since the unwrapped one fails to find the
+    # headers.
+    ++ lib.optionals stdenv.cc.isGNU [
+      "CC=${stdenv.cc.targetPrefix}cc"
+    ];
 
   outputs = [
     "out"

From 2467e9335635a8efa0ffad47f58e3939028a6128 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 22:53:08 +0100
Subject: [PATCH 2/2] linuxPackages.shufflecake: 0.5.2 -> 0.5.5

---
 pkgs/os-specific/linux/shufflecake/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index f8bda2bcfd5b..c087b0c55382 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -9,13 +9,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "shufflecake";
-  version = "0.5.2";
+  version = "0.5.5";
+
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "shufflecake";
     repo = "shufflecake-c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s=";
+    hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -44,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 shufflecake $bin/shufflecake
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Plausible deniability (hidden storage) layer for Linux";
     homepage = "https://shufflecake.net";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ oluceps ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ oluceps ];
     outputsToInstall = [ "bin" ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     broken = kernel.kernelOlder "6.1" || kernel.meta.name == "linux-lqx-6.12.1";
   };
 })