diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-10 19:10:05 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-11 16:38:15 +0200 |
commit | db343436f0e678ef3a97e6f8ac559ffa0507e422 (patch) | |
tree | 882fd0a0fa2fa41fac62a929a93aba09f5eea4d5 /pkgs/webapps/ttrss/default.nix | |
parent | 34c7b88e16d1768b1b9a0cfa6dd21ea5d9b1b308 (diff) | |
download | Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.gz Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.zst Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.zip |
Migrate mylibs to niv (work in progress)
Diffstat (limited to 'pkgs/webapps/ttrss/default.nix')
-rw-r--r-- | pkgs/webapps/ttrss/default.nix | 10 |
1 files changed, 7 insertions, 3 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 @@ | |||
1 | { ttrss_config ? "/etc/ttrss/config.php" | 1 | { ttrss_config ? "/etc/ttrss/config.php" |
2 | , varDir ? "/var/lib/ttrss" | 2 | , varDir ? "/var/lib/ttrss" |
3 | , stdenv, mylibs, lib, callPackage }: | 3 | , stdenv, lib, callPackage, sources }: |
4 | let | 4 | let |
5 | pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ]; | 5 | pluginNames = [ "auth_ldap" "af_feedmod" "feediron" "ff_instagram" "tumblr_gdpr_ua" ]; |
6 | allPlugins = lib.attrsets.genAttrs pluginNames | 6 | allPlugins = lib.attrsets.genAttrs pluginNames |
@@ -19,7 +19,11 @@ let | |||
19 | passthru = toPassthru newTtrss (pkg.plugins ++ plugins); | 19 | passthru = toPassthru newTtrss (pkg.plugins ++ plugins); |
20 | }); | 20 | }); |
21 | in newTtrss; | 21 | in newTtrss; |
22 | package = stdenv.mkDerivation (mylibs.fetchedGit ./tt-rss.json // rec { | 22 | package = stdenv.mkDerivation rec { |
23 | pname = "tt-rss"; | ||
24 | version = sources.webapps-ttrss.version; | ||
25 | name = "${pname}-${version}"; | ||
26 | src = sources.webapps-ttrss; | ||
23 | buildPhase = '' | 27 | buildPhase = '' |
24 | rm -rf lock feed-icons cache | 28 | rm -rf lock feed-icons cache |
25 | ln -sf ${varDir}/{lock,feed-icons,cache} . | 29 | ln -sf ${varDir}/{lock,feed-icons,cache} . |
@@ -29,5 +33,5 @@ let | |||
29 | ln -s ${ttrss_config} $out/config.php | 33 | ln -s ${ttrss_config} $out/config.php |
30 | ''; | 34 | ''; |
31 | passthru = toPassthru package []; | 35 | passthru = toPassthru package []; |
32 | }); | 36 | }; |
33 | in package | 37 | in package |