diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-09-26 08:23:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 08:23:08 -0500 |
| commit | 6882716623bc6b1cdeec662337e34ed0c9f18782 (patch) | |
| tree | 4ecad2924ef3a718c680654c73a17120b787ff58 /pkgs/applications/video | |
| parent | 43850833b58c19ac9525c0b4ea19729595c7204b (diff) | |
| parent | 06697c7e29b98e8d65565182fb9b112d0e2ed044 (diff) | |
Merge pull request #98846 from ttuegel/libvlc
Build standalone libvlc
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/hdhomerun-config-gui/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index a147de52da82..91feb178ca05 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libhdhomerun, vlc, gcc, gnumake, pkg-config, gtk2 }: +{ stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 8a2cd1728227..5fe10b39a79b 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -20,7 +20,7 @@ , xorg , makeWrapper , pkgconfig -, vlc +, libvlc , mbedtls , scriptingSupport ? true @@ -65,7 +65,7 @@ in mkDerivation rec { qtsvg speex x264 - vlc + libvlc makeWrapper mbedtls ] @@ -84,7 +84,7 @@ in mkDerivation rec { postInstall = '' wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; postFixup = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 365eb8cd991d..965a5ff32530 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - broken = versionAtLeast qtbase.version "5.15"; + broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false; }; } |