about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-05-22 20:27:38 +0300
committerDoron Behar <doron.behar@gmail.com>2020-05-24 01:25:33 +0300
commitf93918bdc387d353285f458c06c6a111ae90b7b2 (patch)
tree575b575c33cadd60e0d0d164982af660acbcc251 /pkgs/top-level/all-packages.nix
parent93ff93d53970b645a2732914cc7244399b31d2f0 (diff)
downloadnixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar.gz
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar.bz2
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar.lz
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar.xz
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.tar.zst
nixlib-f93918bdc387d353285f458c06c6a111ae90b7b2.zip
mpv: Move all wrappings to a single wrapper Nix function
Inspired by `wrapNeovim`, write a wrapMpv Nix function that creates a
derivation that has all of the environment that was added if needed at
the unwrapped version.

Add derivations to all-packages.nix in an almost compatible way and make
`mpv-with-scripts` throw a message implying to switch to `wrapMpv` which
has an incompatible signature.

Add to vapoursynth a new passthru attribute `python3` that is used in
passed down to the wrapper to ensure ABI compatibility with
`PYTHONPATH`.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cfd71b806c9..3206632041e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20862,12 +20862,14 @@ in
     libdvdnav = libdvdnav_4_2_1;
   } // (config.mplayer or {}));
 
-  mpv = callPackage ../applications/video/mpv {
+  mpv-unwrapped = callPackage ../applications/video/mpv {
     inherit lua;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
   };
 
-  mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };
+  # Wraps without trigerring a rebuild
+  wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { };
+  mpv = wrapMpv mpv-unwrapped {};
 
   mpvScripts = recurseIntoAttrs {
     convert = callPackage ../applications/video/mpv/scripts/convert.nix {};