diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-16 00:15:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-16 00:15:12 +0000 |
commit | 7b8f253d6599933d883ea91c1dcfc1d3e3f60628 (patch) | |
tree | 5aa93d00225161abe76b0bff0e5c6af1129d88f3 /pkgs/games | |
parent | 7070f7baf75ce6a10aa215f0b5c1957482659d5a (diff) | |
parent | 242522b8fed8d63f262fd6e747ba1e4372b59a8e (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/anki/bin.nix | 133 |
1 files changed, 84 insertions, 49 deletions
diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 6af284843e71b..0d9465b770605 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -1,24 +1,36 @@ -{ fetchurl, stdenv, lib, buildFHSEnv, appimageTools, writeShellScript, anki, undmg, zstd, cacert, commandLineArgs ? [] }: +{ + fetchurl, + stdenv, + lib, + buildFHSEnv, + appimageTools, + writeShellScript, + anki, + undmg, + zstd, + cacert, + commandLineArgs ? [ ], +}: let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.04.1"; + version = "24.06.2"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-elUTr0Lumw5bzWbeU74m8e/AxQPNpKXiIOC0Rcgh3AY="; + sha256 = "sha256-A7/R7nQUt0L4fKFadPvKyi1sCEUIXcOZSW+Yr1ty63c="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-LlHbZ8Yw17Ym11L1lqMibAaV8XWB8oiMFGQxE1PvApI="; + sha256 = "sha256-tZjR5ebzbm9w5m66Q2cy8Oe1VtqGEDpLfjpgbUh07Lo="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-lMUfIvV4biaOb0ABTZciBP59XY1Ln3tkwphi2oaRu4c="; + sha256 = "sha256-/SVtyvsPWv5EGiNTbfHbPtguLi/oNytO16JPnD7IaCM="; }; }; @@ -43,57 +55,80 @@ let }; meta = with lib; { - inherit (anki.meta) license homepage description longDescription; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + inherit (anki.meta) + license + homepage + description + longDescription + ; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; maintainers = with maintainers; [ mahmoudk1000 ]; }; - passthru = { inherit sources; }; - - fhsEnvAnki = buildFHSEnv (appimageTools.defaultFhsEnvArgs // { - inherit pname version; - - profile = '' - # anki vendors QT and mixing QT versions usually causes crashes - unset QT_PLUGIN_PATH - # anki uses the system ssl cert, without it plugins do not download/update - export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; - - # Dependencies of anki - targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile xcb-util-cursor-HEAD krb5 zstd ]); - - runScript = writeShellScript "anki-wrapper.sh" '' - exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArgs commandLineArgs } "$@" - ''; - - extraInstallCommands = '' - ln -s ${pname} $out/bin/anki - - mkdir -p $out/share - cp -R ${unpacked}/share/applications \ - ${unpacked}/share/man \ - ${unpacked}/share/pixmaps \ - $out/share/ - ''; + passthru = { + inherit sources; + }; - inherit meta passthru; - }); + fhsEnvAnki = buildFHSEnv ( + appimageTools.defaultFhsEnvArgs + // { + inherit pname version; + + profile = '' + # anki vendors QT and mixing QT versions usually causes crashes + unset QT_PLUGIN_PATH + # anki uses the system ssl cert, without it plugins do not download/update + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + # Dependencies of anki + targetPkgs = + pkgs: + (with pkgs; [ + xorg.libxkbfile + xcb-util-cursor-HEAD + krb5 + zstd + ]); + + runScript = writeShellScript "anki-wrapper.sh" '' + exec ${unpacked}/bin/anki ${lib.strings.escapeShellArgs commandLineArgs} "$@" + ''; + + extraInstallCommands = '' + ln -s ${pname} $out/bin/anki + + mkdir -p $out/share + cp -R ${unpacked}/share/applications \ + ${unpacked}/share/man \ + ${unpacked}/share/pixmaps \ + $out/share/ + ''; + + inherit meta passthru; + } + ); in -if stdenv.isLinux then fhsEnvAnki -else stdenv.mkDerivation { - inherit pname version passthru; +if stdenv.isLinux then + fhsEnvAnki +else + stdenv.mkDerivation { + inherit pname version passthru; - src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; + src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; - nativeBuildInputs = [ undmg ]; - sourceRoot = "."; + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; - installPhase = '' - mkdir -p $out/Applications/ - cp -a Anki.app $out/Applications/ - ''; + installPhase = '' + mkdir -p $out/Applications/ + cp -a Anki.app $out/Applications/ + ''; - inherit meta; -} + inherit meta; + } |