From 0eb50abb66b4612f2a404c6c29c2ec5f98f67f19 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Sat, 17 Aug 2024 16:28:27 +0200
Subject: [PATCH 1/2] composefs: 1.0.4 -> 1.0.5

---
 pkgs/by-name/co/composefs/package.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix
index 1157d749daa3..40e81d6a967f 100644
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@@ -25,27 +25,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "composefs";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "composefs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ekUFLZGWTsiJZFv3nHoxuV057zoOtWBIkt+VdtzlaU4=";
+    hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw=";
   };
 
   strictDeps = true;
   outputs = [ "out" "lib" "dev" ];
 
-  patches = [
-    # fixes composefs-info tests, remove in next release
-    # https://github.com/containers/composefs/pull/291
-    (fetchpatch {
-      url = "https://github.com/containers/composefs/commit/f7465b3a57935d96451b392b07aa3a1dafb56e7b.patch";
-      hash = "sha256-OO3IfqLf3dQGjEgKx3Bo630KALmLAWwgdACuyZm2Ujc=";
-    })
-  ];
-
   postPatch = lib.optionalString installExperimentalTools ''
     sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am
   '';
@@ -73,9 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   preCheck = ''
     patchShebangs --build tests/*dir tests/*.sh
-    substituteInPlace tests/*.sh \
-      --replace-quiet " /tmp" " $TMPDIR" \
-      --replace-quiet " /var/tmp" " $TMPDIR"
   '';
 
   passthru = {

From 57e0c2c588899a2261b042e8e98076c122b3ff63 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Sat, 17 Aug 2024 16:31:09 +0200
Subject: [PATCH 2/2] composefs: build with meson

---
 pkgs/by-name/co/composefs/package.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix
index 40e81d6a967f..80b832a56174 100644
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@@ -3,13 +3,13 @@
 , fetchFromGitHub
 , fetchpatch
 
-, autoreconfHook
+, meson
+, ninja
 , go-md2man
 , pkg-config
 , openssl
 , fuse3
 , libcap
-, libseccomp
 , python3
 , which
 , valgrind
@@ -38,21 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [ "out" "lib" "dev" ];
 
   postPatch = lib.optionalString installExperimentalTools ''
-    sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am
+    sed -i "s/install : false/install : true/g" tools/meson.build
   '';
 
-  configureFlags = [
-    (lib.enableFeature true "man")
-    (lib.enableFeature enableValgrindCheck "valgrind-test")
-  ];
-
-  nativeBuildInputs = [ autoreconfHook go-md2man pkg-config ];
+  nativeBuildInputs = [ meson ninja go-md2man pkg-config ];
   buildInputs = [ openssl ]
     ++ lib.optional fuseSupport fuse3
     ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) (
     [
       libcap
-      libseccomp
     ]
   );
 
@@ -62,8 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional fuseSupport fuse3
     ++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [ erofs-utils fsverity-utils ];
 
+  mesonCheckFlags = lib.optionals enableValgrindCheck "--setup=valgrind";
+
   preCheck = ''
-    patchShebangs --build tests/*dir tests/*.sh
+    patchShebangs --build ../tests/*dir ../tests/*.sh
   '';
 
   passthru = {