JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #135340 from SuperSandro2000/mpv

Browse Source 
mpv: split dev output
This commit is contained in:
Anderson Torres 2021-08-26 09:46:27 -03:00 committed by GitHub
commit 071adcf7db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/mpv/default.nix
View File

@ -97,6 +97,8 @@ in stdenv.mkDerivation rec {
pname = "mpv"; pname = "mpv";
version = "0.33.1"; version = "0.33.1";
outputs = [ "out" "dev" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mpv-player"; owner = "mpv-player";
repo = "mpv"; repo = "mpv";
@ -153,8 +155,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
addOpenGLRunpath docutils perl pkg-config python3 wafHook which addOpenGLRunpath docutils perl pkg-config python3 wafHook which
] ] ++ optional swiftSupport swift;
++ optional swiftSupport swift;
buildInputs = [ buildInputs = [
ffmpeg freetype libass libpthreadstubs ffmpeg freetype libass libpthreadstubs
@ -206,6 +207,9 @@ in stdenv.mkDerivation rec {
cp TOOLS/umpv $out/bin cp TOOLS/umpv $out/bin
cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
sed -i '/Icon=/ ! s/mpv/umpv/g' $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 '' '' + optionalString stdenv.isDarwin ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r build/mpv.app $out/Applications cp -r build/mpv.app $out/Applications

3
pkgs/applications/video/mpv/wrapper.nix
View File

@ -61,7 +61,8 @@ let
symlinkJoin { symlinkJoin {
name = "mpv-with-scripts-${mpv.version}"; 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 ]; buildInputs = [ makeWrapper ];