Merge pull request NixOS#318588 from 1sixth/fix-mpv-test

nixos/tests/mpv: adapt to the new mpv wrapper
braack · Jun 10, 2024 · cfbeda8 · cfbeda8
2 parents cd7ec24 + 54072d5
commit cfbeda8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/nixos/tests/mpv.nix b/nixos/tests/mpv.nix
@@ -12,7 +12,7 @@ in
     {
       environment.systemPackages = [
         pkgs.curl
-        (pkgs.wrapMpv pkgs.mpv-unwrapped {
+        (pkgs.mpv.override {
           scripts = [ pkgs.mpvScripts.simple-mpv-webui ];
         })
       ];

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
@@ -50,6 +50,7 @@
   meson,
   mujs,
   ninja,
+  nixosTests,
   nv-codec-headers-11,
   openalSoft,
   pipewire,
@@ -60,6 +61,7 @@
   speex,
   stdenv,
   swift,
+  testers,
   vapoursynth,
   vulkan-headers,
   vulkan-loader,
@@ -351,6 +353,18 @@ stdenv'.mkDerivation (finalAttrs: {
 
     wrapper = callPackage ./wrapper.nix { };
     scripts = callPackage ./scripts { };
+
+    tests = {
+      inherit (nixosTests) mpv;
+
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+      };
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+        moduleNames = [ "mpv" ];
+      };
+    };
   };
 
   meta = {