Added trackma package and fixed adl package

3 files changed, 33 insertions, 5 deletions

diff --git a/packages/adl/default.nix b/packages/adl/default.nix
index 4ec7ac4..4a15a4b 100644
--- a/packages/adl/default.nix
+++ b/packages/adl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, bash, anime-dl, trackma, mpv, fzf }:
+{ stdenv, lib, fetchFromGitHub, makeWrapper, bash, anime-downloader, trackma, mpv, fzf }:
 stdenv.mkDerivation {
   pname = "adl";
   version = "1.0";
@@ -6,14 +6,14 @@ stdenv.mkDerivation {
     owner = "RaitaroH";
     repo = "adl";
     rev = "65f68e1dcae4c0caa52668d3a854269e7d226f7c";
-    sha256 = "sha256-fRK3N+UnBPXpvx4Z64JC5TstUi//x5jtrm+rFDxIQUs=";
+    sha256 = "sha256-huGpDtkWrhZyKDNKXat8T3qtAyMjBaq8HFd1w1ThUVk=";
   };
-  buildInputs = [ bash anime-dl trackma mpv fzf ];
+  buildInputs = [ bash anime-downloader trackma mpv fzf ];
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''
     mkdir -p $out/bin
     cp adl $out/bin/adl  
     wrapProgram $out/bin/adl \
-      --prefix PATH : ${lib.makeBinPath [ bash anime-dl trackma mpv fzf ]}
+      --prefix PATH : ${lib.makeBinPath [ bash anime-downloader trackma mpv fzf ]}
   '';
 }
diff --git a/packages/default.nix b/packages/default.nix
index e4f4d13..cc8ad9f 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -3,6 +3,7 @@ final: prev:
   custom.smart-wallpaper = prev.callPackage ./smart-wallpaper { };
   custom.dwmbar = prev.callPackage ./dwmbar { };
   custom.xwinwrapr = prev.callPackage ./xwinwrap { };
-  custom.adl = prev.callPackage ./adl { };
+  custom.trackma = prev.callPackage ./trackma { };
   custom.anime-downloader = prev.callPackage ./anime-downloader { pkgs = prev; };
+  custom.adl = prev.callPackage ./adl { anime-downloader = final.custom.anime-downloader; trackma = final.custom.trackma; };
 }
diff --git a/packages/trackma/default.nix b/packages/trackma/default.nix
new file mode 100644
index 0000000..5494253
--- /dev/null
+++ b/packages/trackma/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, lib }:
+
+pkgs.python38.pkgs.buildPythonApplication rec {
+  pname = "trackma";
+  version = "0.8.4";
+
+  buildInputs = with pkgs; [ gobject-introspection gtk3 gnome.adwaita-icon-theme ];
+  nativeBuildInputs = with pkgs; [ wrapGAppsHook ];
+  propagatedBuildInputs = with pkgs.python38.pkgs; [ setuptools pygobject3 pycairo pillow ];
+
+  #bug with fetchFromGithub?
+  src = pkgs.fetchgit {
+    url = "https://github.com/z411/trackma.git";
+    rev = "934c567096bbe5104d6ad7a21014d04b1b198052";
+    sha256 = "sha256-Es95F6TTPzHDt5sXLseV9gi8erDvmJEvlB0Kl1RPpB4=";
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/z411/trackma";
+    description = "Open multi-site list manager for Unix-like systems.";
+    license = licenses.gpl3;
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+  };
+}