diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-23 12:01:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-23 12:01:17 +0000 |
commit | 568f38122138d407fd65867055a6f4ec4dfd52cd (patch) | |
tree | d190dc9ec048265e28814725eda8ab80c1ea37ac /pkgs/applications/video | |
parent | b7a76c8b5e99302632017bd4066c689503567d86 (diff) | |
parent | 05f11d5cf849d11eca3863409f3608f8068bb72d (diff) | |
download | nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.gz nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.bz2 nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.lz nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.xz nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.tar.zst nixlib-568f38122138d407fd65867055a6f4ec4dfd52cd.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/anilibria-winmaclinux/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/video/streamlink-twitch-gui/bin.nix | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 93c8e8ec5ce8..ee6c34965200 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , qmake +, pkg-config , qtbase , qtquickcontrols2 , qtwebsockets @@ -15,29 +16,27 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.12"; + version = "1.2.14"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; - rev = version; - sha256 = "sha256-J9MBnHrVnDaJ8Ykf/n8OkWKbK/JfMxorH9E+mKe3T8k="; + rev = "d941607f078c72fca104ee1e7916cc0ddcc0acf5"; + sha256 = "sha256-G4KlYAjOT1UV29vcX7Q8dMTj0BX0rsJcLtK2MQag5nU="; }; sourceRoot = "source/src"; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; patches = [ ./0001-fix-installation-paths.patch ./0002-disable-version-check.patch - ./0003-build-with-vlc.patch ]; preConfigure = '' substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' \ - --replace '@VLC_PATH@' '${libvlc}/include' + --replace "\$\$PREFIX" '${placeholder "out"}' ''; qtWrapperArgs = [ @@ -52,6 +51,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake + pkg-config wrapQtAppsHook copyDesktopItems ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 89a441159de0..ac74ed748f41 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; + mainProgram = "streamlink-twitch-gui"; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; |