mpv: replace deprecated mpv-with-scripts module with wrapMpv

See: - <NixOS/nixpkgs#88620> - <NixOS/nixpkgs#89208>
berbiche · May 31, 2020 · 64fd7ab · 64fd7ab
1 parent d64fff1
commit 64fd7ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -69,7 +69,7 @@
 
 /modules/programs/matplotlib.nix @rprospero
 
-/modules/programs/mpv.nix @tadeokondrak
+/modules/programs/mpv.nix @tadeokondrak @berbiche
 
 /modules/programs/noti.nix @marsam
 

diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
@@ -19,4 +19,10 @@
  github = "owm111";
  githubId = 7798336;
  };
+ berbiche = {
+ name = "Nicolas Berbiche";
+ email = "nicolas@normie.dev";
+ github = "berbiche";
+ githubId = 20448408;
+ };
 }
diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix
@@ -125,7 +125,7 @@ in {
  (if cfg.scripts == [ ] then
  pkgs.mpv
  else
- pkgs.mpv-with-scripts.override { scripts = cfg.scripts; })
+ pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; })
  ];
  }
  (mkIf (cfg.config != { } || cfg.profiles != { }) {
@@ -139,5 +139,5 @@ in {
  })
  ]);
 
- meta.maintainers = with maintainers; [ tadeokondrak ];
+ meta.maintainers = [ maintainers.tadeokondrak hm.maintainers.berbiche ];
 }