From b14ce3cfb8ea68f772ef8cba93999278bfa134a3 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Sat, 16 Nov 2024 17:03:21 +0100
Subject: [PATCH] Build with neoidiosyn flake

---
 flake.lock | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix  |  22 +++++------
 2 files changed, 119 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5134ed1..632d2de 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,99 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flakey-profile": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
+    "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731683711,
+        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
+        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": [
+          "neoidiosyn",
+          "lix"
+        ],
+        "nixpkgs": [
+          "neoidiosyn",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731185731,
+        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
+        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
+      }
+    },
+    "neoidiosyn": {
+      "inputs": {
+        "lix": "lix",
+        "lix-module": "lix-module",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732014539,
+        "narHash": "sha256-dRiSuk5AgYAZLHSoqZiVTNddsLEHo4mwkkvBCJDdqR0=",
+        "ref": "refs/heads/main",
+        "rev": "ff066c1853edc944e150e10c48c7ffeb723361bb",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://woof.rip/mikael/neoidiosyn.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://woof.rip/mikael/neoidiosyn.git"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1731531548,
@@ -18,8 +112,24 @@
     },
     "root": {
       "inputs": {
+        "neoidiosyn": "neoidiosyn",
         "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",
diff --git a/flake.nix b/flake.nix
index 7c1d2c1..4bcb07a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    neoidiosyn = {
+      url = "git+https://woof.rip/mikael/neoidiosyn.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   nixConfig = {
@@ -11,12 +15,10 @@
     extra-trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
   };
 
-  outputs = { self, nixpkgs, ... }: let
+  outputs = { self, nixpkgs, neoidiosyn, ... }: let
     inherit (nixpkgs) lib;
   in {
-    packages = lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
-      pkgs = nixpkgs.legacyPackages.${system}.pkgsMusl;
-      mimalloc = pkgs.mimalloc.override { secureBuild = true; };
+    packages = lib.mapAttrs (system: pkgs: let
       extraWrapper = prevAttrs: {
         buildCommand = prevAttrs.buildCommand + ''
           sed -i \
@@ -32,7 +34,7 @@
         extraPoliciesFiles = [ ./policy.nix ];
       }).overrideAttrs extraWrapper;
 
-      firefox-unwrapped = ((pkgs.buildMozillaMach {
+      firefox-unwrapped = (pkgs.buildMozillaMach {
         pname = "firefox";
 
         inherit (pkgs.firefox-beta-unwrapped)
@@ -41,13 +43,7 @@
         extraConfigureFlags = [
           "--enable-default-toolkit=cairo-gtk3-wayland-only"
         ];
-
-        extraBuildInputs = [ mimalloc ];
-      }).overrideAttrs (prevAttrs: {
-        env = prevAttrs.env or { } // {
-          LDFLAGS = lib.toList prevAttrs.env.LDFLAGS or [ ] ++ [ "-lmimalloc" ] |> toString;
-        };
-      })).override {
+      }).override {
         alsaSupport = false;
         ffmpegSupport = true;
         gssSupport = false;
@@ -86,7 +82,7 @@
         privacySupport = true;
         drmSupport = false;
       };
-    });
+    }) neoidiosyn.legacyPackages;
 
     hydraJobs = self.packages |> lib.foldlAttrs (jobs: system: packages: lib.recursiveUpdate jobs
       (lib.mapAttrs (name: package: { ${system} = package; }) packages)) { };