about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2020-05-27 01:22:39 +0200
committeraszlig <aszlig@nix.build>2020-05-27 01:30:28 +0200
commit6bc949731ee89d8c8562ebf0e395b03f67881735 (patch)
treec8a6f3f985371c81b9c063013c957d5d6e3a2e2d
parentc6d7400dbf6f711521e4f69c44fd73b97b19adb4 (diff)
profpatsch/pkgs: Switch to using wrapMpv
Recently, the way to add scripts to the mpv wrapper has changed[1] and
instead of using .override, there is now a dedicated wrapMpv function
that can be used to compose the wrapped mpv derivation, similar on how
it's done for wrapFirefox and wrapNeovim.

The change also introduced the following evaluation error when using the
old mpv-with-scripts package:

  Use wrapMpv for editing the environment of mpv

Since this evaluation error essentially blocks Vuizvui channel
generation, I decided to fix this, even though I usually try to avoid
touching other people's machine configurations.

[1]: https://github.com/NixOS/nixpkgs/commit/f93918bdc387d353285f458c06c6a111ae90b7b2

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch
-rw-r--r--machines/profpatsch/pkgs.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index 4afe40c1..f5b6f36f 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -6,7 +6,7 @@ assert withUnfree -> unfreeAndNonDistributablePkgs != null;
 
 let
 
-  mpv = pkgs.mpv-with-scripts.override {
+  mpv = pkgs.wrapMpv pkgs.mpv-unwrapped {
     scripts = [ pkgs.mpvScripts.convert ];
   };