X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=ad87111b28dbab266112d5b58bcb797571af631d;hb=f5761aac8dbfb4af91c232f2b52d1353c899abda;hp=08e6955ae03bef6a22fe6109c3ae6bcf31875aaa;hpb=5145061e9b679ea1e5d2709d22d0ee53467fed15;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index 08e6955..ad87111 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,10 +1,14 @@
-{ mylibs, runCommand, buildBowerComponents, pythonPackages, jq, yarn, nodejs }:
+{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }:
 let
   buildslist_src = mylibs.fetchedGit ./buildslist.json;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
-    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"' > $out
+    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
     '';
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
+  nodeHeaders = fetchurl {
+    url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
+    sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
+  };
+  buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
     name = "buildslist-yarn-modules";
     pname = name;
     inherit (pythonPackages.buildbot-pkg) version;
@@ -12,7 +16,13 @@ let
     yarnLock = "${buildslist_src.src}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
-      all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
+      node-sass = {
+        buildInputs = [ libsass python ];
+        postInstall =
+          ''
+            node scripts/build.js --tarball=${nodeHeaders}
+          '';
+      };
     };
   };
   buildslist_bower = buildBowerComponents {
@@ -20,24 +30,30 @@ let
     generated = ./bower.nix;
     src = "${buildslist_src.src}/guanlecoja/";
   };
+  # the buildbot-pkg calls yarn and screws up everything...
+  fakeYarn = writeScriptBin "yarn" ''
+    #!${stdenv.shell}
+    if [ "$1" = "--version" ]; then
+      echo "1.17"
+    fi
+    '';
 in
 pythonPackages.buildPythonPackage rec {
   pname = "buildbot-buildslist";
   inherit (pythonPackages.buildbot-pkg) version;
 
-  __noChroot = true;
   preConfigure = ''
     export HOME=$PWD
-    cp -a ${buildslist_yarn}/node_modules .
-    chmod -R u+w node_modules
+    ln -s ${buildslist_yarn}/node_modules .
     cp -a ${buildslist_bower}/bower_components ./libs
+    PATH=${buildslist_yarn}/node_modules/.bin:$PATH
     chmod -R u+w libs
     '';
   propagatedBuildInputs = with pythonPackages; [
     (klein.overridePythonAttrs(old: { checkPhase = ""; }))
     buildbot-pkg
   ];
-  nativeBuildInputs = [ yarn nodejs ];
+  nativeBuildInputs = [ fakeYarn nodejs ];
   buildInputs = [ buildslist_yarn buildslist_bower ];
 
   doCheck = false;