diff options
| author | aszlig <aszlig@nix.build> | 2018-07-19 16:22:05 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-07-19 16:22:05 +0200 |
| commit | 6faaab46e0d49f4e47af2b1db16eddb859038159 (patch) | |
| tree | 0fad68c868a74f329e6ea6ebdd7bdcf8272f4f34 | |
| parent | 184989810d14f29087c37fd90f1ece14e2a863df (diff) | |
Fix mpv overrides with scripts attribute
Since NixOS/nixpkgs@402ee4e9eaf08a697672718cd502067c726a7c73, mpv by itself no longer has a script argument but there is now "mpv-with-scripts", which boils down to something similar. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Profpatsch, @sternenseemann
| -rw-r--r-- | machines/profpatsch/pkgs.nix | 4 | ||||
| -rw-r--r-- | machines/sternenseemann/pkgs.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix index 4bb7066c..af95188c 100644 --- a/machines/profpatsch/pkgs.nix +++ b/machines/profpatsch/pkgs.nix @@ -45,7 +45,9 @@ let }).ghcWithPackages; }; - mpv = pkgs.mpv.override { scripts = [ pkgs.mpvScripts.convert ]; }; + mpv = pkgs.mpv-with-scripts.override { + scripts = [ pkgs.mpvScripts.convert ]; + }; beets = pkgs.beets.override { enableAlternatives = true; }; diff --git a/machines/sternenseemann/pkgs.nix b/machines/sternenseemann/pkgs.nix index 2081597e..e580c4da 100644 --- a/machines/sternenseemann/pkgs.nix +++ b/machines/sternenseemann/pkgs.nix @@ -2,7 +2,9 @@ let - mpv = pkgs.mpv.override { scripts = [ pkgs.mpvScripts.convert ]; }; + mpv = pkgs.mpv-with-scripts.override { + scripts = [ pkgs.mpvScripts.convert ]; + }; texlive = with pkgs.texlive; combine { inherit scheme-medium minted units collection-bibtexextra wrapfig libertine enumitem dashrule ifmtarg xstring; }; |