Fix wetter packaging

pkgs/overlay.nix

@@ -6,7 +6,7 @@ self: super: {
   pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
   uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};
   wetter = self.python3.pkgs.callPackage ./wetter {
-    inherit (self) python2 pkgconfig libsass;
+    inherit (self) pkgconfig libsass;
   };
   # The current version in nixpkgs is b0rked, but no new release is made yet
   prometheus-xmpp-alerts = super.prometheus-xmpp-alerts.overrideAttrs (oldAttrs: {

pkgs/wetter/default.nix

@@ -4,12 +4,11 @@
   flask_sqlalchemy,
   lib,
   libsass,
-  mkYarnModules,
+  yarn2nix-moretea,
   nodejs,
   pkgconfig,
   pkgs,
   psycopg2,
-  python2,
   python3,
   stdenv,
   flask-excel,
@@ -20,7 +19,7 @@ let
   src = fetchGit {
     url = "https://git.clerie.de/clerie/wetter.git";
     ref = "master";
-    rev = "bb503828098717825c389fd6f450b395a02dcc6a";
+    rev = "4cfac906acd1c134c0e20bab6ef931aa4edc3530";
   };
   pname = "wetter";
   version = "0.0.1";
@@ -28,25 +27,20 @@ let
   packageJSON = src + "/package.json";
   yarnLock = src + "/yarn.lock";
 
-  modules = mkYarnModules {
+  modules = yarn2nix-moretea.mkYarnModules {
     pname = "${pname}-modules";
     name = "${pname}-modules-${version}";
     inherit version packageJSON yarnLock;
 
     /* build native node-sass extensions */
-    # building sass is b0rked so we just don't to that for now
-    /*
     pkgConfig.node-sass = {
-      buildInputs = [ python2 libsass pkgconfig ];
+      buildInputs = [ python3 libsass pkgconfig ];
       postInstall = ''
-        mkdir -p $HOME/.node-gyp/${nodejs.version}
-        echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
-        ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+        export npm_config_nodedir=${nodejs}
         LIBSASS_EXT=auto yarn --offline run build
         rm build/config.gypi
       '';
     };
-    */
   };
 
   assets = stdenv.mkDerivation {