Merge pull request #100606 from cideM/node-merge-pr

nodePackages: init sass clubhouse-cli makam inliner undollar (combine several PRs)
NixOS · Oct 16, 2020 · a1a01bd · a1a01bd
2 parents afe60ae + b1b63b6
commit a1a01bd
Show file tree

Hide file tree

Showing 3 changed files with 3,676 additions and 2,080 deletions.
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
@@ -73,6 +73,18 @@ let
       nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
     });
 
+    makam =  super.makam.override {
+      buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
+      postFixup = ''
+        wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]}
+        ${
+          if stdenv.isLinux
+            then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
+            else ""
+        }
+      '';
+    };
+
     mirakurun = super.mirakurun.override rec {
       nativeBuildInputs = with pkgs; [ makeWrapper ];
       postInstall = let

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
@@ -18,6 +18,7 @@
 , "browserify"
 , "castnow"
 , "clean-css-cli"
+, "clubhouse-cli"
 , "coc-css"
 , "coc-emmet"
 , "coc-eslint"
@@ -82,6 +83,7 @@
 , "gitmoji-cli"
 , "graphql-cli"
 , "grunt-cli"
+, "makam"
 , "gtop"
 , "gulp"
 , "gulp-cli"
@@ -90,6 +92,7 @@
 , "htmlhint"
 , "http-server"
 , "hueadm"
+, "inliner"
 , "imapnotify"
 , "indium"
 , "insect"
@@ -161,6 +164,7 @@
 , "rollup"
 , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
 , "s3http"
+, "sass"
 , "semver"
 , "serve"
 , "serverless"
@@ -201,6 +205,7 @@
 , "typescript"
 , "typescript-language-server"
 , "uglify-js"
+, "undollar"
 , "ungit"
 , "vega-cli"
 , "vega-lite"