switch to the overrideAttrs approach

Author: jrobsonchase

flake.nix

@@ -27,23 +27,15 @@
       ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
-      mkCargoAbout = pkgs: pkgs.callPackage ./nix/cargo-about.nix { };
       mkZed =
         pkgs:
         let
-          lib = pkgs.lib;
           rustBin = rust-overlay.lib.mkRustBin { } pkgs;
         in
-        pkgs.callPackage ./nix/build.nix (
-          {
-            crane = crane.mkLib pkgs;
-            rustToolchain = rustBin.fromRustupToolchainFile ./rust-toolchain.toml;
-          }
-          // (lib.optionalAttrs (pkgs.cargo-about.version != "0.8.2") {
-            # Only vendor the build of cargo-about if the input nixpkgs has the wrong version.
-            cargo-about = mkCargoAbout pkgs;
-          })
-        );
+        pkgs.callPackage ./nix/build.nix {
+          crane = crane.mkLib pkgs;
+          rustToolchain = rustBin.fromRustupToolchainFile ./rust-toolchain.toml;
+        };
     in
     rec {
       packages = forAllSystems (pkgs: rec {

nix/build.nix

@@ -90,7 +90,6 @@ let
         perl
         pkg-config
         protobuf
-        cargo-about
         rustPlatform.bindgenHook
       ]
       ++ lib.optionals stdenv'.hostPlatform.isLinux [ makeWrapper ]
@@ -106,6 +105,36 @@ let
             };
             cargoHash = "sha256-urn+A3yuw2uAO4HGmvQnKvWtHqvG9KHxNCCWTiytE4k=";
 
+            # NOTE: can drop once upstream uses `finalAttrs` here:
+            # https://github.com/NixOS/nixpkgs/blob/10214747f5e6e7cb5b9bdf9e018a3c7b3032f5af/pkgs/build-support/rust/build-rust-package/default.nix#L104
+            #
+            # See (for context): https://github.com/NixOS/nixpkgs/pull/382550
+            cargoDeps = rustPlatform.fetchCargoVendor {
+              inherit (new) src;
+              hash = new.cargoHash;
+              patches = new.cargoPatches or [ ];
+              name = new.cargoDepsName or new.finalPackage.name;
+            };
+          }
+        ))
+      ]
+      # Pin cargo-about to 0.8.2. Newer versions don't work with the current license identifiers
+      # See https://github.com/zed-industries/zed/pull/44012
+      ++ lib.optionals (cargo-about.version == "0.8.2") [ cargo-about ]
+      ++ lib.optionals (cargo-about.version != "0.8.2") [
+        (cargo-about.overrideAttrs (
+          new: old: rec {
+            version = "0.8.2";
+
+            src = fetchFromGitHub {
+              owner = "EmbarkStudios";
+              repo = "cargo-about";
+              tag = version;
+              sha256 = "sha256-cNKZpDlfqEXeOE5lmu79AcKOawkPpk4PQCsBzNtIEbs=";
+            };
+
+            cargoHash = "sha256-NnocSs6UkuF/mCM3lIdFk+r51Iz2bHuYzMT/gEbT/nk=";
+
             # NOTE: can drop once upstream uses `finalAttrs` here:
             # https://github.com/NixOS/nixpkgs/blob/10214747f5e6e7cb5b9bdf9e018a3c7b3032f5af/pkgs/build-support/rust/build-rust-package/default.nix#L104
             #