fix n format

This commit is contained in:
notgne2 2020-04-27 18:50:31 -07:00
parent 6035f3931f
commit 4565d0858f

View File

@ -1,16 +1,26 @@
{ pkgs, google-chrome, symlinkJoin, stdenv, elmPackages, libjpeg, optipng { pkgs
, pngquant, libwebp, ... }: , google-chrome
, symlinkJoin
, stdenv
, elmPackages
, libjpeg
, optipng
, pngquant
, libwebp
, ...
}:
let let
workingElmPackages = if elmPackages.elmVersion == "0.19.1" then workingElmPackages = if elmPackages.elmVersion == "0.19.1" then
elmPackages elmPackages
else else
(import <unstable> { }).elmPackages; (import <unstable> {}).elmPackages;
pnpm2nix = pkgs.callPackage (builtins.fetchGit { pnpm2nix = pkgs.callPackage (
builtins.fetchGit {
url = "https://github.com/notgne2/pnpm2nix.git"; url = "https://github.com/notgne2/pnpm2nix.git";
rev = "909accd35d23664254b43109ee58cd0c3d83a6d9"; rev = "909accd35d23664254b43109ee58cd0c3d83a6d9";
}) { }; }
) {};
nodeCleanSourceFilter = name: type: nodeCleanSourceFilter = name: type:
pkgs.lib.cleanSourceFilter name type pkgs.lib.cleanSourceFilter name type
@ -36,8 +46,10 @@ let
pnpmLock = ./pnpm-lock.yaml; pnpmLock = ./pnpm-lock.yaml;
src = nodeCleanSource ./.; src = nodeCleanSource ./.;
overrides = pnpm2nix.defaultPnpmOverrides // { overrides = pnpm2nix.defaultPnpmOverrides // {
puppeteer = (drv: puppeteer = (
drv.overrideAttrs (oldAttrs: { drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = '' preBuild = ''
# Define the local chromium directory # Define the local chromium directory
local_chromium=$HOME/node_modules/puppeteer/.local-chromium/linux-686378 local_chromium=$HOME/node_modules/puppeteer/.local-chromium/linux-686378
@ -48,56 +60,88 @@ let
cp ${google-chrome}/bin/google-chrome-stable $local_chromium/chrome-linux/chrome cp ${google-chrome}/bin/google-chrome-stable $local_chromium/chrome-linux/chrome
chmod +x $local_chromium/chrome-linux/chrome chmod +x $local_chromium/chrome-linux/chrome
''; '';
})); }
imagemin-pngquant = (drv: )
);
imagemin-pngquant = (
drv:
drv.overrideAttrs drv.overrideAttrs
(oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.libpng ]; })); (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.libpng ]; })
pngquant-bin = (drv: );
drv.overrideAttrs (oldAttrs: { pngquant-bin = (
drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = '' preBuild = ''
mkdir -p $HOME/node_modules/pngquant-bin/vendor mkdir -p $HOME/node_modules/pngquant-bin/vendor
ln -s ${pngquant}/bin/pngquant $HOME/node_modules/pngquant-bin/vendor/pngquant ln -s ${pngquant}/bin/pngquant $HOME/node_modules/pngquant-bin/vendor/pngquant
''; '';
})); }
)
);
gifsicle = (drv: gifsicle = (
drv.overrideAttrs (oldAttrs: { drv:
drv.overrideAttrs (
oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.autoconf pkgs.automake ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.autoconf pkgs.automake ];
})); }
)
);
optipng = optipng =
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ optipng ]; })); (drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ optipng ]; }));
optipng-bin = (drv: optipng-bin = (
drv.overrideAttrs (oldAttrs: { drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = '' preBuild = ''
mkdir -p $HOME/node_modules/optipng-bin/vendor mkdir -p $HOME/node_modules/optipng-bin/vendor
ln -s ${optipng}/bin/optipng $HOME/node_modules/optipng-bin/vendor/optipng ln -s ${optipng}/bin/optipng $HOME/node_modules/optipng-bin/vendor/optipng
''; '';
})); }
)
);
jpegtran = jpegtran =
(drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ libjpeg ]; })); (drv: drv.overrideAttrs (oldAttrs: { buildInputs = [ libjpeg ]; }));
jpegtran-bin = (drv: jpegtran-bin = (
drv.overrideAttrs (oldAttrs: { drv:
drv.overrideAttrs (
oldAttrs: {
preBuild = '' preBuild = ''
mkdir -p $HOME/node_modules/jpegtran-bin/vendor mkdir -p $HOME/node_modules/jpegtran-bin/vendor
ln -s ${libjpeg}/bin/jpegtran $HOME/node_modules/jpegtran-bin/vendor/jpegtran ln -s ${libjpeg}/bin/jpegtran $HOME/node_modules/jpegtran-bin/vendor/jpegtran
''; '';
})); }
)
);
cwebp-bin = (drv: cwebp-bin = (
drv.overrideAttrs (oldAttrs: { drv:
drv.overrideAttrs (
oldAttrs: {
buildPhase = '' buildPhase = ''
mkdir -p $HOME/node_modules/cwebp-bin/vendor/ mkdir -p $HOME/node_modules/cwebp-bin/vendor/
ln -s ${libwebp}/bin/cwebp $HOME/node_modules/cwebp-bin/vendor/cwebp ln -s ${libwebp}/bin/cwebp $HOME/node_modules/cwebp-bin/vendor/cwebp
''; '';
})); }
)
);
}; };
}; };
mkWandardFront = { name, prettyName ? name, description ? "" mkWandardFront =
, themeColor ? "#000000", backgroundColor ? "#000000", src { name
, nodePackages ? [ ], routes ? [ "/" ], }: , prettyName ? name
, description ? ""
, themeColor ? "#000000"
, backgroundColor ? "#000000"
, src
, nodePackages ? []
, routes ? [ "/" ]
,
}:
let let
nodeSource = symlinkJoin { nodeSource = symlinkJoin {
name = "${name}-node-sources"; name = "${name}-node-sources";
@ -173,7 +217,7 @@ let
src = elmCleanSource src; src = elmCleanSource src;
buildInputs = with workingElmPackages; [ elm elm-format nodeSource ]; buildInputs = with workingElmPackages; [ elm nodeSource ];
patchPhase = '' patchPhase = ''
ln -sf ${nodeSource}/node_modules . ln -sf ${nodeSource}/node_modules .
@ -211,4 +255,5 @@ let
mv dist/* $out mv dist/* $out
''; '';
}; };
in { inherit mkWandardFront; } in
{ inherit mkWandardFront; }