2 files changed, 7 insertions, 17 deletions

diff --git a/pkgs/webapps/ttrss/default.nix b/pkgs/webapps/ttrss/default.nix
index 38200a1..aeb573c 100644
--- a/pkgs/webapps/ttrss/default.nix
+++ b/pkgs/webapps/ttrss/default.nix
@@ -1,6 +1,6 @@
 { ttrss_config ? "/etc/ttrss/config.php"
 , varDir ? "/var/lib/ttrss"
-, stdenv, mylibs, lib, callPackage }:
+, stdenv, lib, callPackage, sources }:
 let
   pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ];
   allPlugins = lib.attrsets.genAttrs pluginNames
@@ -19,7 +19,11 @@ let
         passthru = toPassthru newTtrss (pkg.plugins ++ plugins);
       });
     in newTtrss;
-  package = stdenv.mkDerivation (mylibs.fetchedGit ./tt-rss.json // rec {
+  package = stdenv.mkDerivation rec {
+    pname = "tt-rss";
+    version = sources.webapps-ttrss.version;
+    name = "${pname}-${version}";
+    src = sources.webapps-ttrss;
     buildPhase = ''
       rm -rf lock feed-icons cache
       ln -sf ${varDir}/{lock,feed-icons,cache} .
@@ -29,5 +33,5 @@ let
       ln -s ${ttrss_config} $out/config.php
     '';
     passthru = toPassthru package [];
-  });
+  };
 in package
diff --git a/pkgs/webapps/ttrss/tt-rss.json b/pkgs/webapps/ttrss/tt-rss.json
deleted file mode 100644
index e2731b0..0000000
--- a/pkgs/webapps/ttrss/tt-rss.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "986ca25-master",
-  "meta": {
-    "name": "tt-rss",
-    "url": "https://git.tt-rss.org/fox/tt-rss.git",
-    "branch": "master"
-  },
-  "git": {
-    "url": "https://git.tt-rss.org/fox/tt-rss.git",
-    "rev": "986ca251f995f7754a0470d3e0c44538a545081f",
-    "sha256": "0xkafkh7l9zazm5d6snlq03kdfxfhkb4c8fdsb32wn8b9bhdzf5s",
-    "fetchSubmodules": true
-  }
-}