From 7b9a097d6fada1f0fe6440938b5c50c717d278a6 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 13 Dec 2024 15:57:01 -0500 Subject: [PATCH] rm custom anki-bin --- nix/home/yt/ytnix.nix | 1 + nix/pkgs/anki-bin.nix | 134 ------------------------------------------ nix/pkgs/default.nix | 1 - 3 files changed, 1 insertion(+), 135 deletions(-) delete mode 100644 nix/pkgs/anki-bin.nix diff --git a/nix/home/yt/ytnix.nix b/nix/home/yt/ytnix.nix index 384aeba..9e2a5dd 100644 --- a/nix/home/yt/ytnix.nix +++ b/nix/home/yt/ytnix.nix @@ -116,6 +116,7 @@ nextcloud-client python312Packages.python-lsp-server gopls + anki-bin ]; programs.waybar.enable = true; diff --git a/nix/pkgs/anki-bin.nix b/nix/pkgs/anki-bin.nix deleted file mode 100644 index 782fb8d..0000000 --- a/nix/pkgs/anki-bin.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ - fetchurl, - stdenv, - lib, - buildFHSEnv, - appimageTools, - writeShellScript, - anki, - undmg, - zstd, - cacert, - commandLineArgs ? [], -}: let - pname = "anki-bin"; - # Update hashes for both Linux and Darwin! - version = "24.11"; - - sources = { - linux = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - hash = "sha256-JXn4oxhRODHh6b5hFFj393xMRlaJRVcbMJ5AyXr+jq8="; - }; - - # 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"; - hash = "sha256-UQRdp/GhiRGfsBF+mV6hCKpEQGFv/I9D9KTtc1p776o="; - }; - darwin-aarch64 = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - hash = "sha256-zi9yjJirNxFFD7wGa4++J+mDaE5dYZW+X0UUddGkjTU="; - }; - }; - - unpacked = stdenv.mkDerivation { - inherit pname version; - - nativeBuildInputs = [zstd]; - src = sources.linux; - - installPhase = '' - runHook preInstall - - xdg-mime () { - echo Stubbed! - } - export -f xdg-mime - - PREFIX=$out bash install.sh - - runHook postInstall - ''; - }; - - meta = with lib; { - inherit - (anki.meta) - license - homepage - description - mainProgram - 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/ - ''; - - inherit meta passthru; - } - ); -in - if stdenv.hostPlatform.isLinux - then fhsEnvAnki - else - stdenv.mkDerivation { - inherit pname version passthru; - - src = - if stdenv.hostPlatform.isAarch64 - then sources.darwin-aarch64 - else sources.darwin-x86_64; - - nativeBuildInputs = [undmg]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications/ - cp -a Anki.app $out/Applications/ - ''; - - inherit meta; - } diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index f69472f..5d56bdc 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -1,3 +1,2 @@ pkgs: { - anki-bin = pkgs.callPackage ./anki-bin.nix {}; }