diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-08-22 22:49:20 +0200 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-08-23 02:24:09 +0200 |
commit | 145b75fe00612487baaf8cebaf7c36201953a50e (patch) | |
tree | 2a61f93541954564bbeea95dcf19e0ae220d56e4 /pkgs/applications/video/mpv | |
parent | a6e2f2fc904ef85ad96ba06726797c5e93fc9bb3 (diff) |
mpv: split dev and man output
Diffstat (limited to 'pkgs/applications/video/mpv')
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/wrapper.nix | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3bde154305791..93c3b2203b75c 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -97,6 +97,8 @@ in stdenv.mkDerivation rec { pname = "mpv"; version = "0.33.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; @@ -153,8 +155,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ addOpenGLRunpath docutils perl pkg-config python3 wafHook which - ] - ++ optional swiftSupport swift; + ] ++ optional swiftSupport swift; buildInputs = [ ffmpeg freetype libass libpthreadstubs @@ -206,6 +207,9 @@ in stdenv.mkDerivation rec { cp TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop + + substituteInPlace $out/lib/pkgconfig/mpv.pc \ + --replace "$out/include" "$dev/include" '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 4d61971956e95..5225197772c7d 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -61,7 +61,8 @@ let symlinkJoin { name = "mpv-with-scripts-${mpv.version}"; - paths = [ mpv ]; + # TODO: don't link all mpv outputs and convert package to mpv-unwrapped? + paths = [ mpv.all ]; buildInputs = [ makeWrapper ]; |