diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-18 19:02:09 -0600 |
| commit | 2c1d3a9a824938e37a1a67f7532ac6f417f917c2 (patch) | |
| tree | b16b4cdf7c63b21f6ecbc6b04fcadd54b546d829 /pkgs/applications/video | |
| parent | e6f4f0ef8db8a2e600ecf38d4cda7777ba6f04b3 (diff) | |
| parent | 0925c482c8378e8a6a8724edc6596ea60f90a113 (diff) | |
| download | nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.gz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.bz2 nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.lz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.xz nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.tar.zst nixlib-2c1d3a9a824938e37a1a67f7532ac6f417f917c2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/smtube/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 0188bb4784d6..c5dcec387236 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "18.9.0"; + version = "18.11.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1211vqgmbrqr8mcsyawirmqkzq05g1xwigx6lswnyxd88x37w6fg"; + sha256 = "0rda7mdsr0awhra9yrmsdzp2c4s6xx5nax107d1fydnk084pygqp"; }; makeFlags = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6cba5236a5f1..cbf3c4917c35 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -38,16 +38,17 @@ stdenv.mkDerivation rec { systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms - libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 + libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols - ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] + ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; enableParallelBuilding = true; - LIVE555_PREFIX = live555; + LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { postFixup = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $out/lib/vlc/vlc-cache-gen $out/vlc/plugins - + '' + optionalString withQt5 '' remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; |