Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec64627b97a6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3c32e66327b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2021

  1. vlc: add skin support (#109235)

    @lucasew
    lucasew authored Jan 17, 2021
    Copy the full SHA
    d3c32e6 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/video/vlc/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/video/vlc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,9 @@
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, onlyLibVLC ? false
, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null, wrapQtAppsHook ? null
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
, jackSupport ? false
, skins2Support ? !onlyLibVLC, freetype
, removeReferencesTo
, chromecastSupport ? true, protobuf, libmicrodns
}:
@@ -21,8 +22,6 @@

with lib;

assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null);

stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc";
version = "3.0.11.1";
@@ -52,6 +51,7 @@ stdenv.mkDerivation rec {
fluidsynth wayland wayland-protocols
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
++ optional jackSupport libjack2
++ optionals chromecastSupport [ protobuf libmicrodns ];

@@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-kde-solid=$out/share/apps/solid/actions"
] ++ optional onlyLibVLC "--disable-vlc"
++ optional skins2Support "--enable-skins2"
++ optionals chromecastSupport [
"--enable-sout"
"--enable-chromecast"