nodePackages: init multiple packages
This commit combines several individual PRs which would have resulted in merge conflicts in the generated JSON files. Instead, the "generate.sh" script is only ran once. Due to "makam" not building on MacOS in the form it was originally added in the PR I made some adjustments to this diff. List of added packages: - nodePackages.clubhouse-cli: init at 2.1.0 - nodePackages.makam: init at 0.7.17 - nodePackages.inliner: init at 1.13.1 - nodePackages.sass: init at 1.27.0 - nodePackages.undollar: init at 1.0.0 Co-authoring is used to preserve contributions. Co-authored-by: Changlin Li <mail@changlinli.com> Co-authored-by: Pasquale <p3dimaria@hotmail.it> Co-authored-by: Teodoro Freund <teodoro.freund@tweag.io> Co-authored-by: Tobias Mayer <tobim@fastmail.fm> Co-authored-by: vladki <vlad@kirillov.im>
This commit is contained in:
parent
ee813768c0
commit
b1b63b66c9
|
@ -73,6 +73,18 @@ let
|
||||||
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
|
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 {
|
mirakurun = super.mirakurun.override rec {
|
||||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||||
postInstall = let
|
postInstall = let
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
, "browserify"
|
, "browserify"
|
||||||
, "castnow"
|
, "castnow"
|
||||||
, "clean-css-cli"
|
, "clean-css-cli"
|
||||||
|
, "clubhouse-cli"
|
||||||
, "coc-css"
|
, "coc-css"
|
||||||
, "coc-emmet"
|
, "coc-emmet"
|
||||||
, "coc-eslint"
|
, "coc-eslint"
|
||||||
|
@ -82,6 +83,7 @@
|
||||||
, "gitmoji-cli"
|
, "gitmoji-cli"
|
||||||
, "graphql-cli"
|
, "graphql-cli"
|
||||||
, "grunt-cli"
|
, "grunt-cli"
|
||||||
|
, "makam"
|
||||||
, "gtop"
|
, "gtop"
|
||||||
, "gulp"
|
, "gulp"
|
||||||
, "gulp-cli"
|
, "gulp-cli"
|
||||||
|
@ -90,6 +92,7 @@
|
||||||
, "htmlhint"
|
, "htmlhint"
|
||||||
, "http-server"
|
, "http-server"
|
||||||
, "hueadm"
|
, "hueadm"
|
||||||
|
, "inliner"
|
||||||
, "imapnotify"
|
, "imapnotify"
|
||||||
, "indium"
|
, "indium"
|
||||||
, "insect"
|
, "insect"
|
||||||
|
@ -161,6 +164,7 @@
|
||||||
, "rollup"
|
, "rollup"
|
||||||
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
|
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
|
||||||
, "s3http"
|
, "s3http"
|
||||||
|
, "sass"
|
||||||
, "semver"
|
, "semver"
|
||||||
, "serve"
|
, "serve"
|
||||||
, "serverless"
|
, "serverless"
|
||||||
|
@ -201,6 +205,7 @@
|
||||||
, "typescript"
|
, "typescript"
|
||||||
, "typescript-language-server"
|
, "typescript-language-server"
|
||||||
, "uglify-js"
|
, "uglify-js"
|
||||||
|
, "undollar"
|
||||||
, "ungit"
|
, "ungit"
|
||||||
, "vega-cli"
|
, "vega-cli"
|
||||||
, "vega-lite"
|
, "vega-lite"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue