From e10ff893e568adddec1c7f8cc95bcd768ba48b38 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 13 Oct 2024 22:40:09 +0200
Subject: [PATCH] packaging: Factor out mkPackageBuilder

---
 packaging/dependencies.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packaging/dependencies.nix b/packaging/dependencies.nix
index 49a65ce9e..3e58a05d1 100644
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@@ -38,6 +38,10 @@ let
   # Indirection for Nixpkgs to override when package.nix files are vendored
   filesetToSource = lib.fileset.toSource;
 
+  /** Given a set of layers, create a mkDerivation-like function */
+  mkPackageBuilder = exts: userFn:
+    stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn);
+
   localSourceLayer = finalAttrs: prevAttrs:
     let
       workDirPath =
@@ -62,7 +66,6 @@ let
 
   mesonLayer = finalAttrs: prevAttrs:
     {
-      mesonFlags = prevAttrs.mesonFlags or [];
       nativeBuildInputs = [
         pkgs.buildPackages.meson
         pkgs.buildPackages.ninja
@@ -182,15 +185,11 @@ scope: {
 
   inherit resolvePath filesetToSource;
 
-  mkMesonDerivation = f: let
-    exts = [
+  mkMesonDerivation =
+    mkPackageBuilder [
       miscGoodPractice
       bsdNoLinkAsNeeded
       localSourceLayer
       mesonLayer
     ];
-  in stdenv.mkDerivation
-   (lib.extends
-     (lib.composeManyExtensions exts)
-     f);
 }