Work on all systems

codecs/mozjpeg/flake.lock

@@ -1,6 +1,24 @@
 {
   "nodes": {
-    "mozjpeg": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "mozjpeg-src": {
       "flake": false,
       "locked": {
         "lastModified": 1499684294,
@@ -35,9 +53,25 @@
     },
     "root": {
       "inputs": {
-        "mozjpeg": "mozjpeg",
+        "flake-utils": "flake-utils",
+        "mozjpeg-src": "mozjpeg-src",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

codecs/mozjpeg/flake.nix

@@ -1,9 +1,8 @@
 {
   inputs = {
-    nixpkgs = {
+    nixpkgs.url = "github:nixos/nixpkgs/24.05";
-      url = "github:nixos/nixpkgs/24.05";
+    flake-utils.url = "github:numtide/flake-utils";
-    };
+    mozjpeg-src = {
-    mozjpeg = {
       url = "github:mozilla/mozjpeg/v3.3.1";
       flake = false;
     };
@@ -12,23 +11,25 @@
     {
       self,
       nixpkgs,
-      mozjpeg,
+      flake-utils,
+      mozjpeg-src,
     }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
-      system = "aarch64-darwin";
+        pkgs = nixpkgs.legacyPackages.${system};
-      pkgs = import nixpkgs { inherit system; };
       in
       with pkgs;
-    rec {
+      {
-      packages.${system} = {
+        packages = rec {
           default = stdenv.mkDerivation {
             name = "mozjpeg-squoosh";
             src = ./.;
             nativeBuildInputs = [
               emscripten
-            packages.${system}.mozjpeg
+              mozjpeg
             ];
-          MOZJPEG = packages.${system}.mozjpeg;
+            MOZJPEG = mozjpeg;
             dontConfigure = true;
             buildPhase = ''
               export HOME=$TMPDIR
@@ -41,7 +42,7 @@
           };
           mozjpeg = stdenv.mkDerivation {
             name = "mozjpeg";
-          src = mozjpeg;
+            src = mozjpeg-src;
             nativeBuildInputs = [
               autoconf
               automake
@@ -75,7 +76,7 @@
             dontFixup = true;
           };
         };
-      devShells.${system}.default = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           packages = [
             autoconf
             automake
@@ -84,8 +85,9 @@
             pkg-config
           ];
           shellHook = ''
-          echo "Path to MozJPEG: ${mozjpeg}"
+            echo "Path to MozJPEG: ${mozjpeg-src}"
           '';
         };
-    };
+      }
+    );
 }