diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix index 0901bb74..415b5222 100644 --- a/codecs/resize/flake.nix +++ b/codecs/resize/flake.nix @@ -15,13 +15,14 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; - inherit (pkgs) callPackage writeShellScriptBin; + inherit (pkgs) callPackage; buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};}; + mkInstallable = callPackage (import ../../nix/mk-installable) {}; src = ./.; in - { + mkInstallable { packages = rec { default = resize-squoosh; resize-squoosh = buildSquooshRustCodec { @@ -34,17 +35,6 @@ sha256 = "sha256-HTElSB76gqCpDu8S0ZJlfd/S4ftMrbwxFgJM9OXBRz8="; }; }; - - installScript = writeShellScriptBin "install.sh" '' - ${pkgs.coreutils}/bin/mkdir -p wasm_build - ${pkgs.rsync}/bin/rsync --chmod=u+w -r ${self.packages.${system}.resize-squoosh}/* wasm_build/ - ''; - }; - apps = { - install = { - type = "app"; - program = "${self.packages.${system}.installScript}/bin/install.sh"; - }; }; } ); diff --git a/codecs/resize/wasm_build/squoosh_resize_bg.wasm b/codecs/resize/wasm_build/squoosh_resize_bg.wasm index d37ebb14..3757062a 100644 Binary files a/codecs/resize/wasm_build/squoosh_resize_bg.wasm and b/codecs/resize/wasm_build/squoosh_resize_bg.wasm differ diff --git a/codecs/rotate/flake.nix b/codecs/rotate/flake.nix index bbc33a12..4a56a6ed 100644 --- a/codecs/rotate/flake.nix +++ b/codecs/rotate/flake.nix @@ -19,10 +19,11 @@ inherit (pkgs) callPackage writeShellScriptBin; buildSquooshRustCodec= callPackage (import ../../nix/squoosh-rust-builder) {fenix = fenix.packages.${system};}; + mkInstallable = callPackage (import ../../nix/mk-installable) {}; src = ./.; in - { + mkInstallable { packages = rec { default = rotate-squoosh; rotate-squoosh = buildSquooshRustCodec { @@ -33,17 +34,6 @@ }; wasmBindgen = null; }; - - installScript = writeShellScriptBin "install.sh" '' - ${pkgs.coreutils}/bin/mkdir -p wasm_build - ${pkgs.rsync}/bin/rsync --chmod=u+w -r ${self.packages.${system}.rotate-squoosh}/* wasm_build/ - ''; - }; - apps = { - install = { - type = "app"; - program = "${self.packages.${system}.installScript}/bin/install.sh"; - }; }; } ); diff --git a/nix/for-each-option.nix b/nix/for-each-option.nix deleted file mode 100644 index 4c6a6694..00000000 --- a/nix/for-each-option.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib }: -f: opts: -let - derivations = (lib.attrsets.mapAttrsToList f opts); -in -lib.lists.fold (a: b: a // b) { } derivations diff --git a/nix/mk-installable/default.nix b/nix/mk-installable/default.nix new file mode 100644 index 00000000..e032bd2d --- /dev/null +++ b/nix/mk-installable/default.nix @@ -0,0 +1,19 @@ +{ + coreutils, + rsync, + writeShellScriptBin, + lib, +}: +flake: +let + installScript = writeShellScriptBin "install.sh" '' + ${coreutils}/bin/mkdir -p wasm_build + ${rsync}/bin/rsync --chmod=u+w -r ${flake.packages.default}/* wasm_build/ + ''; +in +lib.recursiveUpdate flake { + apps.install = { + type = "app"; + program = "${installScript}/bin/install.sh"; + }; +}