build: Fix nix build

nix source updates

sdfsadf

sdfsdfsadf

nix dont fix libtoll

nix fix

Author: declantsien

.github/workflows/checks.yaml

@@ -1,4 +1,4 @@
-name: "CI"
+name: "CI Nix"
 on:
   pull_request:
   push:
@@ -18,13 +18,8 @@ jobs:
     # Configure Nix to enable flakes
     - run: echo "experimental-features = nix-command flakes" | sudo tee -a /etc/nix/nix.conf
 
-
     - name: Nix Flake Check
       run: nix -Lv flake check
-    - name: Build emacsNg Rust Dependency
-      # remove when nix build is fixed
-      continue-on-error: true
-      run: nix -Lv build .#emacsNG-rust
 
     - uses: cachix/cachix-action@v10
       with:

flake.nix

@@ -38,7 +38,7 @@
             overlays = [
               self.overlays.default
               emacs-overlay.overlay
-              rust-overlay.overlay
+              (import rust-overlay)
               devshell.overlay
             ];
             config = {};
@@ -92,7 +92,6 @@
             {
               inherit
                 (pkgs)
-                emacsng-rust
                 emacsng
                 ;
               default = pkgs.emacsng;
@@ -111,87 +110,11 @@
         emacsng-source = emacsng-sources.emacsng.src;
         locked-date = prev.lib.removePrefix "nightly-" (prev.lib.removeSuffix "\n" (builtins.readFile ./rust-toolchain));
       in {
-        emacsng-rust = with final; (
-          let
-            installPhase = ''
-              tar --owner=0 --group=0 --numeric-owner --format=gnu \
-                --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
-                -czf $out $name-versioned
-            '';
-            doVersionedUpdate = ''
-              cargo vendor --versioned-dirs $name-versioned
-            '';
-
-            emacsngLibDeps = prev.rustPlatform.fetchCargoTarball {
-              src = emacsng-source + "/rust_src/remacs-lib";
-              name = "emacsngLibDeps";
-              cargoUpdateHook = let
-                pathDir = emacsng-source + "/rust_src/crates";
-              in
-                ''
-                  cp -r ${pathDir} crates
-                  sed -i 's|../crates/lisp_util|./crates/lisp_util|' Cargo.toml
-                ''
-                + doVersionedUpdate;
-              sha256 = "sha256-ITFwTAKZoTkGBquxxay20r/H5638ndKpIcvQra2t4cg=";
-              inherit installPhase;
-            };
-
-            ngBindgen = prev.rustPlatform.fetchCargoTarball {
-              src = emacsng-source + "/rust_src/ng-bindgen";
-              sourceRoot = null;
-              cargoUpdateHook = doVersionedUpdate;
-              name = "ngBindgen";
-              sha256 = "sha256-MsMfcZ/Oni5dsOeuA37bSYscQLTZOJe5D4dB8KAgc5s=";
-              inherit installPhase;
-            };
-
-            emacsngSrc = prev.rustPlatform.fetchCargoTarball {
-              src = emacsng-source;
-              cargoUpdateHook =
-                ''
-                  sed -e 's/@CARGO_.*@//' Cargo.in > Cargo.toml
-                  sed -e 's/@WEBRENDER_.*@//' rust_src/crates/webrender/Cargo.in > rust_src/crates/webrender/Cargo.toml
-                ''
-                + doVersionedUpdate;
-              name = "emacsngSrc";
-              sha256 = "sha256-nlzELzshSJWmSaWt5tewSbklnqnvdfWJeWfkdjCX1mo=";
-              inherit installPhase;
-            };
-
-          in
-            stdenv.mkDerivation {
-              name = "emacsng-rust";
-              srcs = [
-                emacsngLibDeps
-                ngBindgen
-                emacsngSrc
-              ];
-              sourceRoot = ".";
-              phases = ["unpackPhase" "installPhase"];
-              installPhase = ''
-                mkdir -p $out/.cargo/registry
-                cat > $out/.cargo/config.toml << EOF
-                [source.crates-io]
-                registry = "https://github.com/rust-lang/crates.io-index"
-                replace-with = "vendored-sources"
-                [source.vendored-sources]
-                directory = "$out/.cargo/registry"
-                EOF
-                cp -R emacsngLibDeps-vendor.tar.gz-versioned/* $out/.cargo/registry
-                cp -R ngBindgen-vendor.tar.gz-versioned/* $out/.cargo/registry
-                cp -R emacsngSrc-vendor.tar.gz-versioned/* $out/.cargo/registry
-              '';
-            }
-        );
-
-        librusty_v8 = prev.callPackage ./nix/librusty_v8.nix {};
-
         emacsng = with prev; let
           withWebrender = true;
         in
           (
-            final.emacsGcc.override
+            final.emacsGit.override
             {
               withImageMagick = true;
               inherit (prev) imagemagick;
@@ -218,6 +141,11 @@
             name = "emacsng-" + version;
             src = emacsng-source;
             version = builtins.substring 0 7 emacsng-source.rev;
+            # https://github.com/NixOS/nixpkgs/blob/22.11/pkgs/applications/networking/browsers/firefox/common.nix#L574
+            # Firefox use this.
+            # guix has cargo-utils to fix checksum, won't be useful on nix though
+            # https://github.com/ctrlcctrlv/revendor.guile
+            dontFixLibtool = true;
 
             preConfigure =
               (old.preConfigure or "")
@@ -236,7 +164,7 @@
             makeFlags =
               (old.makeFlags or [])
               ++ [
-                "CARGO_FLAGS=--offline" #nightly channel
+                # "CARGO_FLAGS=--offline" #nightly channel
               ];
 
             #custom configure Flags Setting
@@ -272,25 +200,6 @@
                 "--with-dbus"
               ];
 
-            preBuild = let
-              arch = rust.toRustTarget stdenv.hostPlatform;
-            in
-              (old.preBuild or "")
-              + ''
-                _librusty_v8_setup() {
-                    for v in "$@"; do
-                      install -D ${final.librusty_v8} "target/$v/gn_out/obj/librusty_v8.a"
-                    done
-                  }
-                  _librusty_v8_setup "debug" "release" "${arch}/release"
-                    sed -i 's|deno = { git = "https://github.com/emacs-ng/deno", branch = "emacs-ng"|deno = { version = "1.9.2"|' rust_src/crates/js/Cargo.toml
-                    sed -i 's|deno_runtime = { git = "https://github.com/emacs-ng/deno", branch = "emacs-ng"|deno_runtime = { version = "0.13.0"|' rust_src/crates/js/Cargo.toml
-                    sed -i 's|deno_core = { git = "https://github.com/emacs-ng/deno", branch = "emacs-ng"|deno_core = { version = "0.86.0"|' rust_src/crates/js/Cargo.toml
-
-                    sed -i 's|git = "https://github.com/servo/webrender.git", rev = ".*."|version = "0.61.0"|' rust_src/crates/webrender/Cargo.toml
-                  export HOME=${final.emacsng-rust}
-              '';
-
             postPatch =
               (old.postPatch or "")
               + ''

nix/_sources/generated.json

@@ -1,22 +1,21 @@
 {
     "emacsng": {
-        "pinned": false,
-        "cargoLock": null,
+        "cargoLocks": null,
+        "extract": null,
         "name": "emacsng",
+        "passthru": null,
+        "pinned": false,
         "src": {
             "deepClone": false,
-            "owner": "emacs-ng",
+            "fetchSubmodules": true,
+            "leaveDotGit": false,
             "name": null,
+            "owner": "declantsien",
             "repo": "emacs-ng",
-            "type": "github",
-            "sha256": "sha256-6J8qsl+fQExCY6oV4E/uko23YHAK1YNPQxdINANMrEk=",
-            "rev": "1e465792a8337d6c12df06304cbc72677f78d090",
-            "leaveDotGit": false,
-            "fetchSubmodules": true
+            "rev": "c18470efe98a3ec33ff18561377548527140cb27",
+            "sha256": "sha256-QTxD6c+nu9ajsiJOqsH3YJXQ9r/ryrTB28uWskKuLJ4=",
+            "type": "github"
         },
-        "version": "1e465792a8337d6c12df06304cbc72677f78d090",
-        "passthru": null,
-        "extract": null,
-        "rustGitDeps": null
+        "version": "c18470efe98a3ec33ff18561377548527140cb27"
     }
 }

nix/_sources/generated.nix

@@ -1,18 +1,15 @@
 # This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub }:
 {
-  fetchgit,
-  fetchurl,
-  fetchFromGitHub,
-}: {
   emacsng = {
     pname = "emacsng";
-    version = "1e465792a8337d6c12df06304cbc72677f78d090";
-    src = fetchFromGitHub {
-      owner = "emacs-ng";
+    version = "c18470efe98a3ec33ff18561377548527140cb27";
+    src = fetchFromGitHub ({
+      owner = "declantsien";
       repo = "emacs-ng";
-      rev = "1e465792a8337d6c12df06304cbc72677f78d090";
+      rev = "c18470efe98a3ec33ff18561377548527140cb27";
       fetchSubmodules = true;
-      sha256 = "sha256-6J8qsl+fQExCY6oV4E/uko23YHAK1YNPQxdINANMrEk=";
-    };
+      sha256 = "sha256-QTxD6c+nu9ajsiJOqsH3YJXQ9r/ryrTB28uWskKuLJ4=";
+    });
   };
 }

nix/sources.toml

@@ -1,5 +1,5 @@
 # nvfetcher.toml
 [emacsng]
-src.git = "https://github.com/emacs-ng/emacs-ng"
-fetch.github = "emacs-ng/emacs-ng"
-git.fetchSubmodules = true
+src.git = "https://github.com/declantsien/emacs-ng"
+src.branch = "vendor"
+fetch.github = "declantsien/emacs-ng"