From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 10 May 2020 19:10:05 +0200 Subject: Migrate mylibs to niv (work in progress) --- pkgs/webapps/ttrss/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/webapps/ttrss/default.nix') 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 -- cgit v1.2.3