1 files changed, 13 insertions, 1 deletions
diff --git a/package.nix b/package.nix
index 5def8416a..082627c49 100644
--- a/package.nix
+++ b/package.nix
@@ -103,7 +103,8 @@
   ] ++ lib.optionals buildWithMeson [
     ./meson.build
     ./meson.options
-    ./meson/cleanup-install.bash
+    ./meson
+    ./scripts/meson.build
   ]);
 
  functionalTestFiles = fileset.unions [
@@ -289,10 +290,21 @@ in stdenv.mkDerivation (finalAttrs: {
   installCheckFlags = "sysconfdir=$(out)/etc";
   installCheckTarget = "installcheck"; # work around buggy detection in stdenv
 
+  mesonInstallCheckFlags = [
+    "--suite=installcheck"
+  ];
+
   preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
     export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
   '';
 
+  installCheckPhase = lib.optionalString buildWithMeson ''
+    runHook preInstallCheck
+    flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}")
+    meson test --no-rebuild "''${flagsArray[@]}"
+    runHook postInstallCheck
+  '';
+
   separateDebugInfo = !stdenv.hostPlatform.isStatic && !finalAttrs.dontBuild;
 
   strictDeps = true;