diff options
Diffstat (limited to 'pkgs/applications/video')
3 files changed, 21 insertions, 38 deletions
diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch deleted file mode 100644 index 6bdfcf2c2d2a..000000000000 --- a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/AniLibria.pro b/AniLibria.pro -index 407dbde..ae69502 100644 ---- a/AniLibria.pro -+++ b/AniLibria.pro -@@ -21,17 +21,17 @@ windows { - DEFINES += NO_NEED_STANDART_PLAYER - } - --#unix { --# LIBS += -lvlc -+unix { -+ LIBS += -lvlc - - # INCLUDEPATH += /usr/include/ - # DEPENDPATH += /usr/include/ - --# INCLUDEPATH += /usr/include/vlc/plugins --# DEPENDPATH += /usr/include/vlc/plugins -+ INCLUDEPATH += @VLC_PATH@/vlc/plugins -+ DEPENDPATH += @VLC_PATH@/vlc/plugins - --# CONFIG += buildwithvlc --#} -+ CONFIG += buildwithvlc -+} - - buildwithvlc { - DEFINES += USE_VLC_PLAYER diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index d35947be850b..522c37f3a625 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -11,23 +11,27 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems -, libvlc + +, withVLC ? true , libvlc +, withMPV ? true , mpv-unwrapped }: mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.15"; + version = "1.2.16.1"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI="; + hash = "sha256-QQliz/tLeYsWgh/ZAO7FfbApAEqWhWoaQe9030QZxA8="; }; sourceRoot = "${src.name}/src"; - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ] + ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ]; patches = [ ./0001-fix-installation-paths.patch @@ -61,14 +65,15 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia - libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good gst-plugins-base gst-libav gstreamer - ]); + ]) + ++ lib.optionals withVLC [ libvlc ] + ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; desktopItems = [ (makeDesktopItem (rec { diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index ac74ed748f41..543b2b524708 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,6 +1,7 @@ { autoPatchelfHook , fetchurl , lib +, copyDesktopItems , makeDesktopItem , makeWrapper , stdenv @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { alsa-lib autoPatchelfHook cairo + copyDesktopItems cups.lib dbus.lib expat @@ -92,8 +94,12 @@ stdenv.mkDerivation rec { # Install all files, remove unnecessary ones cp -a . $out/opt/${basename}/ rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} - ln -s "$out/opt/${basename}/${basename}" $out/bin/ - cp -r "${desktopItem}/share/applications" $out/share/ + ln -s $out/opt/${basename}/${basename} $out/bin/ + for res in 16 32 48 64 128 256; do + install -Dm644 \ + icons/icon-"$res".png \ + $out/share/icons/hicolor/"$res"x"$res"/apps/${basename}.png + done runHook postInstall ''; @@ -105,14 +111,14 @@ stdenv.mkDerivation rec { ) ''; - desktopItem = makeDesktopItem { + desktopItems = [(makeDesktopItem { name = basename; exec = basename; icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; categories = [ "AudioVideo" "Network" ]; - }; + })]; meta = with lib; { description = "Twitch.tv browser for Streamlink"; |