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

nodePackages: init sass clubhouse-cli makam inliner undollar (combine several PRs)
This commit is contained in:
Ryan Mulligan 2020-10-16 05:03:46 -07:00 committed by GitHub
commit a1a01bdd52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3543 additions and 1947 deletions

View file

@ -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

View file

@ -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"

File diff suppressed because it is too large Load diff