Deduplicate nix code

And clean it up a little.

Author: RossSmyth

src/tools/nix-dev-shell/flake.nix

@@ -1,32 +1,19 @@
 {
   description = "rustc dev shell";
 
-  inputs = {
-    nixpkgs.url      = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url  = "github:numtide/flake-utils";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-  outputs = { self, nixpkgs, flake-utils, ... }:
-	flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-        x = import ./x { inherit pkgs; };
-      in
-      {
-        devShells.default = with pkgs; mkShell {
-          name = "rustc-dev-shell";
-          nativeBuildInputs = with pkgs; [
-            binutils cmake ninja pkg-config python3 git curl cacert patchelf nix
-          ];
-          buildInputs = with pkgs; [
-            openssl glibc.out glibc.static x
-          ];
-          # Avoid creating text files for ICEs.
-          RUSTC_ICE = "0";
-          # Provide `libstdc++.so.6` for the self-contained lld.
-          # Provide `libz.so.1`.
-          LD_LIBRARY_PATH = "${with pkgs; lib.makeLibraryPath [stdenv.cc.cc.lib zlib]}";
-        };
+  outputs = {
+    self,
+    nixpkgs,
+  }: let
+    inherit (nixpkgs) lib;
+    forEachSystem = lib.genAttrs lib.systems.flakeExposed;
+  in {
+    devShells = forEachSystem (
+      system: {
+        default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix {};
       }
     );
+  };
 }

src/tools/nix-dev-shell/shell.nix

@@ -1,18 +1,18 @@
-{ pkgs ? import <nixpkgs> {} }:
-let 
-  x = import ./x { inherit pkgs; };
+{pkgs ? import <nixpkgs> {}}: let
+  x = pkgs.callPackage ./x {};
 in
-pkgs.mkShell {
-  name = "rustc";
-  nativeBuildInputs = with pkgs; [
-    binutils cmake ninja pkg-config python3 git curl cacert patchelf nix
-  ];
-  buildInputs = with pkgs; [
-    openssl glibc.out glibc.static x
-  ];
-  # Avoid creating text files for ICEs.
-  RUSTC_ICE = "0";
-  # Provide `libstdc++.so.6` for the self-contained lld.
-  # Provide `libz.so.1`
-  LD_LIBRARY_PATH = "${with pkgs; lib.makeLibraryPath [stdenv.cc.cc.lib zlib]}";
-}
+  pkgs.mkShell {
+    name = "rustc-shell";
+
+    packages = [
+      pkgs.git
+      pkgs.nix
+      pkgs.glibc
+      x
+    ];
+
+    env = {
+      # Avoid creating text files for ICEs.
+      RUSTC_ICE = 0;
+    };
+  }

src/tools/nix-dev-shell/x/default.nix

@@ -1,22 +1,56 @@
 {
-  pkgs ? import <nixpkgs> { },
+  self,
+  pkgs,
+  lib,
+  stdenv,
+  rustc,
+  python3,
+  makeBinaryWrapper,
+  # Bootstrap
+  curl,
+  pkg-config,
+  libiconv,
+  openssl,
+  patchelf,
+  cacert,
+  zlib,
+  # LLVM Deps
+  ninja,
+  cmake,
+  glibc
 }:
-pkgs.stdenv.mkDerivation {
-  name = "x";
+stdenv.mkDerivation {
+  strictDeps = true;
+  pname = "x";
+  version = "none";
+
+  outputs = [
+    "out"
+    "unwrapped"
+  ];
 
   src = ./x.rs;
   dontUnpack = true;
 
-  nativeBuildInputs = with pkgs; [ rustc ];
+  nativeBuildInputs = [rustc makeBinaryWrapper];
 
+  env.PYTHON = python3.interpreter;
   buildPhase = ''
-    PYTHON=${pkgs.lib.getExe pkgs.python3} rustc -Copt-level=3 --crate-name x $src --out-dir $out/bin
+    rustc -Copt-level=3 --crate-name x $src --out-dir $unwrapped/bin
   '';
 
-  meta = with pkgs.lib; {
+  installPhase = ''
+    makeWrapper $unwrapped/bin/x $out/bin/x \
+      --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --prefix CPATH ";" "${lib.makeSearchPath "include" [libiconv]}" \
+      --prefix PATH : ${lib.makeBinPath [python3 patchelf curl pkg-config cmake ninja]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [openssl glibc.static zlib stdenv.cc.cc.lib]}
+    '';
+
+  meta = {
     description = "Helper for rust-lang/rust x.py";
     homepage = "https://github.com/rust-lang/rust/blob/master/src/tools/x";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "x";
   };
 }