ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 12:39:54 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
nixos/tests/mpv: adapt to the new mpv wrapper
This commit is contained in:
Mario Rodas 2024-06-09 21:49:59 -05:00 committed by GitHub
commit cfbeda848e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/mpv.nix
View File

@ -12,7 +12,7 @@ in
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.curl pkgs.curl
(pkgs.wrapMpv pkgs.mpv-unwrapped { (pkgs.mpv.override {
scripts = [ pkgs.mpvScripts.simple-mpv-webui ]; scripts = [ pkgs.mpvScripts.simple-mpv-webui ];
}) })
]; ];

14
pkgs/applications/video/mpv/default.nix
View File

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