X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=default.nix;h=75e1e0a391035babda8137151457dff11b317da2;hp=c2776023bf5627eb12a4cab6bdd2afd1dff180a8;hb=9a35b8f94cc55ee429b36be1a5e7eb1f52934a34;hpb=6f0d92b429069069e6d914f25bb30a549526f9d8

diff --git a/default.nix b/default.nix
index c277602..75e1e0a 100644
--- a/default.nix
+++ b/default.nix
@@ -252,25 +252,6 @@ let
     buildInputs = old.buildInputs ++ [ tokyocabinet bzip2 ];
   });
 
-  mastodon = stdenv.mkDerivation (fetchedGithub ./fetched/mastodon.json // rec {
-    buildPhase = ''
-      export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
-      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-
-      bundle install --deployment --without development test
-      yarn install --pure-lockfile
-    '';
-    installPhase = ''
-      cp -a . $out
-    '';
-    propagatedBuildInputs = [
-      zlib icu libchardet git bundler yarn
-      protobuf protobufc libidn libpqxx nodejs
-      imagemagick ffmpeg libxml2 libxslt pkgconfig
-      autoconf bison libyaml readline ncurses libffi gdbm
-      jemalloc which postgresql python3 cacert
-    ];
-  });
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
 in
@@ -311,7 +292,6 @@ in
     inherit mtr;
     inherit nixops;
     stgit = gitAndTools.stgit;
-    #inherit mastodon;
     # todo: lx* ?, unrar, unzip, zeromq?
     #inherit nextcloud-client;
     #inherit nixos;
@@ -330,4 +310,7 @@ in
     inherit strace;
     inherit notmuch;
     stgit = gitAndTools.stgit;
+    inherit bundix;
+    inherit yarn2nix;
+    bower2nix = nodePackages.bower2nix;
   })