Unverified Commit eca0e285 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #291662 from atorres1985-contrib/vlc

parents 0655f174 c52a056f

pkgs/applications/video/vlc/default.nix→pkgs/by-name/vl/vlc/package.nix

+49 −45
Original line number Diff line number Diff line 
{ lib

, stdenv

, pkgsBuildBuild

, fetchurl

, fetchpatch

, SDL

, SDL_image

, a52dec
@@ -11,6 +7,8 @@ 
, avahi

, dbus

, faad2

, fetchpatch

, fetchurl

, ffmpeg

, flac

, fluidsynth
@@ -48,6 +46,7 @@ 
, libpulseaudio

, libraw1394

, librsvg

, libsForQt5

, libsamplerate

, libspatialaudio

, libssh2
@@ -65,23 +64,20 @@ 
, ncurses

, perl

, pkg-config

, pkgsBuildBuild

, protobuf

, qtbase

, qtsvg

, qtwayland

, qtx11extras

, removeReferencesTo

, samba

, schroedinger

, speex

, srt

, stdenv

, systemd

, taglib

, unzip

, wayland

, wayland-protocols

, wrapGAppsHook

, wrapQtAppsHook

, xcbutilkeysyms

, zlib
@@ -98,7 +94,7 @@ 
#   networking.firewall.allowedTCPPorts = [ 8010 ];



let

  inherit (lib) optionalString optional optionals;

  inherit (lib) optionalString optionals;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "${optionalString onlyLibVLC "lib"}vlc";
@@ -118,8 +114,8 @@ stdenv.mkDerivation (finalAttrs: { 
    unzip

    wrapGAppsHook

  ]

  ++ optional chromecastSupport protobuf

  ++ optionals withQt5 [ wrapQtAppsHook ]

  ++ optionals chromecastSupport [ protobuf ]

  ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ]

  ++ optionals waylandSupport [

    wayland

    wayland-protocols
@@ -191,8 +187,8 @@ stdenv.mkDerivation (finalAttrs: { 
    xcbutilkeysyms

    zlib

  ]

  ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555

  ++ optional jackSupport libjack2

  ++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ]

  ++ optionals jackSupport [ libjack2 ]

  ++ optionals chromecastSupport [ libmicrodns protobuf ]

  ++ optionals skins2Support [

    freetype
@@ -201,8 +197,12 @@ stdenv.mkDerivation (finalAttrs: { 
    libXpm

  ]

  ++ optionals waylandSupport [ wayland wayland-protocols ]

  ++ optionals withQt5 [ qtbase qtsvg qtx11extras ]

  ++ optional (waylandSupport && withQt5) qtwayland;

  ++ optionals withQt5 (with libsForQt5; [

    qtbase

    qtsvg

    qtx11extras

  ])

  ++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];



  env = {

    # vlc depends on a c11-gcc wrapper script which we don't have so we need to
@@ -218,51 +218,37 @@ stdenv.mkDerivation (finalAttrs: { 
    # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473

    (fetchpatch {

      url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch";

      sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda";

      hash = "sha256-qs3gY1ksCZlf931TSZyMuT2JD0sqrmcRCZwL+wVG0U8=";

    })

  ];



  postPatch = ''

    substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \

      /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype

  '' + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''

    # Upstream luac can't cross compile, so we have to install the lua

    # sources, not bytecode:

    substituteInPlace modules/text_renderer/freetype/platform_fonts.h \

      --replace \

        /usr/share/fonts/truetype/freefont \

        ${freefont_ttf}/share/fonts/truetype

  ''

  # Upstream luac can't cross compile, so we have to install the lua sources

  # instead of bytecode:

  # https://www.lua.org/wshop13/Jericke.pdf#page=39

    substituteInPlace share/Makefile.am --replace $'.luac \\\n' $'.lua \\\n'

  + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''

      substituteInPlace share/Makefile.am \

        --replace $'.luac \\\n' $'.lua \\\n'

  '';



  enableParallelBuilding = true;



  dontWrapGApps = true; # to prevent double wrapping of Qtwrap and Gwrap



  preFixup = ''

    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  # - Touch plugins (plugins cache keyed off mtime and file size:

  #     https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830

  # - Remove references to the Qt development headers (used in error messages)

  #

  # pkgsBuildBuild is used here because buildPackages.libvlc somehow

  # depends on a qt5.qttranslations that doesn't build, even though it

  # should be the same as pkgsBuildBuild.qt5.qttranslations.

  postFixup = ''

    find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'

    ${if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc}/lib/vlc/vlc-cache-gen $out/vlc/plugins

  '' + optionalString withQt5 ''

    remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so

  '';



  # Most of the libraries are auto-detected so we don't need to set a bunch of

  # "--enable-foo" flags here

  configureFlags = [

    "--enable-srt" # Explicit enable srt to ensure the patch is applied.

    "--with-kde-solid=$out/share/apps/solid/actions"

  ]

  ++ optional onlyLibVLC "--disable-vlc"

  ++ optional skins2Support "--enable-skins2"

  ++ optional waylandSupport "--enable-wayland"

  ++ optionals onlyLibVLC [ "--disable-vlc" ]

  ++ optionals skins2Support [ "--enable-skins2" ]

  ++ optionals waylandSupport [ "--enable-wayland" ]

  ++ optionals chromecastSupport [

    "--enable-sout"

    "--enable-chromecast"
@@ -285,6 +271,24 @@ stdenv.mkDerivation (finalAttrs: { 
    cp -R share/hrtfs $out/share/vlc

  '';



  preFixup = ''

    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  # - Touch plugins (plugins cache keyed off mtime and file size:

  #     https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830

  # - Remove references to the Qt development headers (used in error messages)

  #

  # pkgsBuildBuild is used here because buildPackages.libvlc somehow

  # depends on a qt5.qttranslations that doesn't build, even though it

  # should be the same as pkgsBuildBuild.qt5.qttranslations.

  postFixup = ''

    find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'

    ${if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc}/lib/vlc/vlc-cache-gen $out/vlc/plugins

  '' + optionalString withQt5 ''

    remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so

  '';



  meta = {

    description = "Cross-platform media player and streaming server";

    homepage = "https://www.videolan.org/vlc/";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -35970,8 +35970,6 @@ with pkgs; 














  vkeybd = callPackage ../applications/audio/vkeybd { };



























  vlc = libsForQt5.callPackage ../applications/video/vlc { };



























  libvlc = vlc.override {















    withQt5 = false;















    onlyLibVLC = true;