From ee61b9fb18d996932e672065034c300199bbf9ef Mon Sep 17 00:00:00 2001
From: Surma <surma@surma.dev>
Date: Wed, 14 Aug 2024 15:12:06 +0100
Subject: [PATCH] Make rust library work

---
 codecs/resize/flake.lock                      |  89 ++++++++++++++++--
 codecs/resize/flake.nix                       |  34 +------
 .../resize/wasm_build/squoosh_resize_bg.wasm  | Bin 36810 -> 36811 bytes
 nix/squoosh-codec-builders/flake.nix          |   4 +-
 4 files changed, 90 insertions(+), 37 deletions(-)

diff --git a/codecs/resize/flake.lock b/codecs/resize/flake.lock
index 1d9374a4..9d0a505b 100644
--- a/codecs/resize/flake.lock
+++ b/codecs/resize/flake.lock
@@ -19,6 +19,25 @@
         "type": "github"
       }
     },
+    "fenix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "rust-analyzer-src": "rust-analyzer-src_2"
+      },
+      "locked": {
+        "lastModified": 1723616992,
+        "narHash": "sha256-jDHYfEECzFwZm4huz7AbPjlH3jJ4/2ns9PddtFA5XMY=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "7bad6c7ff73b784a9c7de9147626c8d5d5072809",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -69,11 +88,28 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1723362943,
+        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-helpers": "rust-helpers",
+        "squoosh-codec-builders": "squoosh-codec-builders",
         "wasm-bindgen": "wasm-bindgen"
       }
     },
@@ -94,6 +130,23 @@
         "type": "github"
       }
     },
+    "rust-analyzer-src_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1723561310,
+        "narHash": "sha256-a3KMMsIDvdo+ClLabh5wfJoa17YTSvy2wDLb8yZCXvc=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "78c2bdce860dbd996a8083224d01a96660dd6a15",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-helpers": {
       "inputs": {
         "fenix": "fenix",
@@ -103,12 +156,36 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-AP5n4QOJS+7V9O0hnZPavnvctfsgfwybu5XOT1HdRcw=",
-        "path": "/nix/store/azy8v63kkb5d39z0zmpixx3hhq2l4h6i-source/nix/rust-helpers",
+        "narHash": "sha256-PvUYYFjHMePbyU/CWQa3uIZB+3YNz+SMtuekxTChdyE=",
+        "path": "../../nix/rust-helpers",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/azy8v63kkb5d39z0zmpixx3hhq2l4h6i-source/nix/rust-helpers",
+        "path": "../../nix/rust-helpers",
+        "type": "path"
+      }
+    },
+    "squoosh-codec-builders": {
+      "inputs": {
+        "fenix": "fenix_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-helpers": [
+          "rust-helpers"
+        ],
+        "wasm-bindgen": [
+          "wasm-bindgen"
+        ]
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-OBp4z5JBmhbxEKPmfD0YLAxn3TeMYhO4yhyMRbj0b1E=",
+        "path": "../../nix/squoosh-codec-builders",
+        "type": "path"
+      },
+      "original": {
+        "path": "../../nix/squoosh-codec-builders",
         "type": "path"
       }
     },
@@ -135,12 +212,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-gb2y+PtDL1uqCVebD4ViN5ruWOmHLburm1gp6xWxx9Y=",
-        "path": "/nix/store/azy8v63kkb5d39z0zmpixx3hhq2l4h6i-source/nix/wasm-bindgen",
+        "narHash": "sha256-uszruLy8B1/xmT7lKjAuKPdxLr6qGqOI32H767V590g=",
+        "path": "../../nix/wasm-bindgen",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/azy8v63kkb5d39z0zmpixx3hhq2l4h6i-source/nix/wasm-bindgen",
+        "path": "../../nix/wasm-bindgen",
         "type": "path"
       }
     }
diff --git a/codecs/resize/flake.nix b/codecs/resize/flake.nix
index 6a863b05..aca6636e 100644
--- a/codecs/resize/flake.nix
+++ b/codecs/resize/flake.nix
@@ -3,16 +3,15 @@
     nixpkgs.url = "github:nixos/nixpkgs/24.05";
     flake-utils.url = "github:numtide/flake-utils";
     wasm-bindgen = {
-      url = "../../nix/wasm-bindgen";
+      url = "path:../../nix/wasm-bindgen";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
     rust-helpers = {
-      url = "../../nix/rust-helpers";
+      url = "path:../../nix/rust-helpers";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     squoosh-codec-builders = {
-      url = "../../nix/squoosh-codec-builders";
+      url = "path:../../nix/squoosh-codec-builders";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.rust-helpers.follows = "rust-helpers";
       inputs.wasm-bindgen.follows = "wasm-bindgen";
@@ -24,6 +23,7 @@
       nixpkgs,
       flake-utils,
       squoosh-codec-builders,
+      ...
     }:
     flake-utils.lib.eachDefaultSystem (
       system:
@@ -31,10 +31,6 @@
       let
         src = ./.;
       in
-      # wasm-bindgen-bin = wasm-bindgen.lib.buildFromCargoLock {
-      #   inherit system cargoLock;
-      #   sha256 = "sha256-HTElSB76gqCpDu8S0ZJlfd/S4ftMrbwxFgJM9OXBRz8=";
-      # };
       {
         packages = rec {
           default = resize-squoosh;
@@ -44,28 +40,8 @@
             cargoLock = {
               lockFile = "${src}/Cargo.lock";
             };
+            wasmBindgenSha = "sha256-HTElSB76gqCpDu8S0ZJlfd/S4ftMrbwxFgJM9OXBRz8=";
           };
-          # resize-squoosh = stdenv.mkDerivation {
-          #   name = "squoosh-resize";
-          #   inherit src;
-          #   nativeBuildInputs = [
-          #     toolchain
-          #     wasm-bindgen-bin
-          #   ];
-          #   dontConfigure = true;
-          #   buildPhase = ''
-          #     runHook preBuild
-          #     export CARGO_HOME=$TMPDIR/.cargo
-          #     cargo build \
-          #       --config 'source.crates-io.replace-with="vendored-sources"' \
-          #       --config 'source.vendored-sources.directory="${vendoredDependencies}"' \
-          #       --offline \
-          #       --target ${target} -r
-          #     wasm-bindgen --target web --out-dir $out ./target/wasm32-unknown-unknown/release/*.wasm
-          #     runHook postBuild
-          #   '';
-          #   dontInstall = true;
-          # };
 
           installScript = writeShellScriptBin "install.sh" ''
             ${pkgs.coreutils}/bin/mkdir -p wasm_build
diff --git a/codecs/resize/wasm_build/squoosh_resize_bg.wasm b/codecs/resize/wasm_build/squoosh_resize_bg.wasm
index 5499b52964a977fca57321289c176a3f7127b300..7152e078f848506fc0a512e53d4c5c7ed06f68da 100644
GIT binary patch
delta 2438
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

delta 2446
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
J<JgTu{{gl!=b!)p

diff --git a/nix/squoosh-codec-builders/flake.nix b/nix/squoosh-codec-builders/flake.nix
index 0e348933..2ea89100 100644
--- a/nix/squoosh-codec-builders/flake.nix
+++ b/nix/squoosh-codec-builders/flake.nix
@@ -3,11 +3,11 @@
     nixpkgs.url = "github:nixos/nixpkgs/24.05";
     fenix.url = "github:nix-community/fenix";
     wasm-bindgen = {
-      url = "../wasm-bindgen";
+      url = "path:../wasm-bindgen";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     rust-helpers = {
-      url = "../rust-helpers";
+      url = "path:../rust-helpers";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };