diff options
-rw-r--r-- | hosts/luna/home.nix | 2 | ||||
-rw-r--r-- | hosts/phobos/home.nix | 2 | ||||
-rw-r--r-- | hosts/vm/home.nix | 2 | ||||
-rw-r--r-- | packages/default.nix | 3 | ||||
-rw-r--r-- | packages/trackma/default.nix | 27 |
5 files changed, 4 insertions, 32 deletions
diff --git a/hosts/luna/home.nix b/hosts/luna/home.nix index 9f485a5..c42c9ed 100644 --- a/hosts/luna/home.nix +++ b/hosts/luna/home.nix @@ -5,12 +5,12 @@ in { home.packages = with pkgs; [ xorg.xmodmap + trackma #calibre #kcc ] ++ (with pkgs.custom; [ adl - trackma #kindlegen manga-cli mov-cli diff --git a/hosts/phobos/home.nix b/hosts/phobos/home.nix index a168343..2dd9621 100644 --- a/hosts/phobos/home.nix +++ b/hosts/phobos/home.nix @@ -7,10 +7,10 @@ in minecraft calibre kcc + trackma ] ++ (with pkgs.custom; [ adl - trackma kindlegen manga-cli mov-cli diff --git a/hosts/vm/home.nix b/hosts/vm/home.nix index ec372d6..6b11c48 100644 --- a/hosts/vm/home.nix +++ b/hosts/vm/home.nix @@ -4,10 +4,10 @@ let in { home.packages = with pkgs; [ + trackma ] ++ (with pkgs.custom; [ adl - trackma ]); xdg.configFile = { diff --git a/packages/default.nix b/packages/default.nix index 81be856..2ef9b52 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -3,8 +3,7 @@ final: prev: custom = { smart-wallpaper = prev.callPackage ./smart-wallpaper { }; dwmbar = prev.callPackage ./dwmbar { }; - trackma = prev.callPackage ./trackma { }; - adl = prev.callPackage ./adl { inherit (final.custom) trackma; }; + adl = prev.callPackage ./adl { }; kindlegen = prev.callPackage ./kindlegen { }; manga-cli = prev.callPackage ./manga-cli { }; mov-cli = prev.callPackage ./mov-cli { }; diff --git a/packages/trackma/default.nix b/packages/trackma/default.nix deleted file mode 100644 index ce31137..0000000 --- a/packages/trackma/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, python39, fetchgit, gobject-introspection, gtk3, gnome, wrapGAppsHook }: - -python39.pkgs.buildPythonApplication rec { - pname = "trackma"; - version = "0.8.4"; - - buildInputs = [ gobject-introspection gtk3 gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = with python39.pkgs; [ setuptools pygobject3 pycairo pillow ]; - - #bug with fetchFromGithub? - src = fetchgit { - url = "https://github.com/z411/${pname}.git"; - rev = "v" + version; - sha256 = "sha256-OoPnOqq2havXc726nXpvoO00BEnjauw8zdXYDltBbsg="; - }; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/z411/${pname}"; - description = "Trackma aims to be a lightweight and simple but feature-rich program for Unix based systems for fetching, updating and using data from personal lists hosted in several media tracking websites."; - license = licenses.gpl3; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} |