flake reorg

This commit is contained in:
Robin Appelman 2024-01-03 18:12:29 +01:00
commit b522666665
5 changed files with 93 additions and 67 deletions

View file

@ -24,21 +24,9 @@
overlays = [
(import rust-overlay)
(final: prev: {
npmlock2nix = import npmlock2nix { pkgs = final; };
rust-wasm = (final.rust-bin.stable.latest.default.override {
targets = [ "wasm32-unknown-unknown" ];
});
demo-inspector-wasm = import ./wasm.nix final;
nodejs = final.nodejs_20;
node_modules = final.npmlock2nix.v2.node_modules {
src = ./www;
nodejs = final.nodejs;
localPackages = {
"demo-inspector" = final.demo-inspector-wasm;
};
};
npmlock2nix = import npmlock2nix {pkgs = final;};
})
(import ./overlay.nix)
];
pkgs = import nixpkgs {
inherit system overlays;
@ -46,7 +34,6 @@
in rec {
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
rust-wasm
cargo-edit
bacon
wasm-pack
@ -56,26 +43,14 @@
];
};
packages.demo-inspector-wasm = pkgs.demo-inspector-wasm;
packages.node_modules = pkgs.node_modules;
packages.demo-inspector = pkgs.stdenv.mkDerivation rec {
name = "demo-inspector";
version = "0.1.0";
src = ./www;
nativeBuildInputs = with pkgs; [nodejs_20];
buildPhase = with pkgs; ''
cp -r ${node_modules}/node_modules ./node_modules
npm run build
'';
installPhase = ''
cp -r dist $out
'';
packages = rec {
wasm = pkgs.demo-inspector-wasm;
node_modules = pkgs.demo-inspector-node-modules;
demo-inspector = pkgs.demo-inspector;
default = demo-inspector;
};
defaultPackage = packages.demo-inspector;
});
})
// {
overlays.default = import ./overlay.nix;
};
}