git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #135340 from SuperSandro2000/mpv

mpv: split dev output

commit071adcf7db830f4aa97da82df133c4f206f2c64e authorAnderson Torres <torres.anderson.85@protonmail.com> dateThu 26 Aug 2021, 09:46 (5 years ago) parentdda968a145b75f
2 files changed+8−3
pkgs/applications/video/mpv/default.nix+6−2 pkgs/applications/video/mpv/wrapper.nix+2−1
pkgs/applications/video/mpv/default.nix+6−2
@@ -97,6 +97,8 @@ in stdenv.mkDerivation rec {
9797 pname = "mpv";
9898 version = "0.33.1";
9999
100+ outputs = [ "out" "dev" ];
101+
100102 src = fetchFromGitHub {
101103 owner = "mpv-player";
102104 repo = "mpv";
@@ -153,8 +155,7 @@ in stdenv.mkDerivation rec {
153155
154156 nativeBuildInputs = [
155157 addOpenGLRunpath docutils perl pkg-config python3 wafHook which
156− ]
157− ++ optional swiftSupport swift;
158+ ] ++ optional swiftSupport swift;
158159
159160 buildInputs = [
160161 ffmpeg freetype libass libpthreadstubs
@@ -206,6 +207,9 @@ in stdenv.mkDerivation rec {
206207 cp TOOLS/umpv $out/bin
207208 cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
208209 sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop
210+
211+ substituteInPlace $out/lib/pkgconfig/mpv.pc \
212+ --replace "$out/include" "$dev/include"
209213 '' + optionalString stdenv.isDarwin ''
210214 mkdir -p $out/Applications
211215 cp -r build/mpv.app $out/Applications
pkgs/applications/video/mpv/wrapper.nix+2−1
@@ -61,7 +61,8 @@ let
6161 symlinkJoin {
6262 name = "mpv-with-scripts-${mpv.version}";
6363
64− paths = [ mpv ];
64+ # TODO: don't link all mpv outputs and convert package to mpv-unwrapped?
65+ paths = [ mpv.all ];
6566
6667 buildInputs = [ makeWrapper ];
6768