chore: update Nix config

imatpot · Aug 30, 2024 · 6f5a8e1 · 6f5a8e1
1 parent c31ea78
commit 6f5a8e1
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 70 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -14,65 +14,65 @@
     };
   };
 
-  outputs = { self, nixpkgs, utils, rust }: utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ (import rust) ];
-      };
-      ssl-toolchain = with pkgs; [
-        openssl.dev
-        pkg-config
-      ];
-      rust-toolchain = with pkgs; [
-        (rust-bin.stable.latest.default.override {
-          extensions = [ "rust-src" ];
-        })
-      ];
-      cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
-    in
-    with pkgs; {
-      packages.default = rustPlatform.buildRustPackage {
-        inherit (cargoToml.package) name version;
+  outputs = { self, nixpkgs, utils, rust }:
+    utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ (import rust) ];
+        };
+        ssl-toolchain = with pkgs; [ openssl.dev pkg-config ];
+        rust-toolchain = with pkgs;
+          [
+            (rust-bin.stable.latest.default.override {
+              extensions = [ "rust-src" ];
+            })
+          ];
+        cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+      in with pkgs; {
+        packages.default = rustPlatform.buildRustPackage {
+          inherit (cargoToml.package) name version;
 
-        src = ./.;
-        cargoLock.lockFile = ./Cargo.lock;
+          src = ./.;
+          cargoLock.lockFile = ./Cargo.lock;
 
-        # https://github.com/sfackler/rust-openssl/issues/1663#issuecomment-1541050597
-        nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
-        buildInputs = lib.optionals stdenv.isLinux [ openssl openssl.dev ];
-        OPENSSL_NO_VENDOR = 1;
-      };
+          # https://github.com/sfackler/rust-openssl/issues/1663#issuecomment-1541050597
+          nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+          buildInputs = lib.optionals stdenv.isLinux [ openssl openssl.dev ];
+          OPENSSL_NO_VENDOR = 1;
+        };
 
-      devShells.default = mkShell {
-        name = "${cargoToml.package.name}-${cargoToml.package.version}";
-        buildInputs = rust-toolchain ++ ssl-toolchain;
-        shellHook = ''
-          echo
-          echo "The near Moon eclipses the far Sun."
-          echo
-          echo "                                       ....                              ..=#%#."
-          echo "                                    .+%@@@#                            -*@@@@@@:"
-          echo "                       :.          =@@*@@@+.=++-                     .#@@=+@@@%."
-          echo "                    =%@@#        :@@%:-@@@%@@#=.         ...       :#@@@:.#@@#."
-          echo "                    #@@@+        -@@. #@@@%-      :=+#%@@@@@%-     %@@@%+@@%-"
-          echo "                    :=.           :. :@@@=     :*@@@@%++++*%%*    .@@@@@%=."
-          echo " :=*#%%**+--..--       :=***+=-:.    =*-    -*%@@@@@%*+=-.         :=--"
-          echo "*%#****%@@@@@@@@=.   +%@%*#%@@@@@@#**%#    *@@@@@@%%%@@@@@@+."
-          echo "        .-#@@@@@@@%+:.      .:+%@@@@@@@*-.  . ..       :+%@@%."
-          echo "           .@@@@@@@@@@%*=.      .=#@@@@@@@%*=:            .+@#."
-          echo "            ..   .-+%@@@@@@#*=:. .-@#+=*%@@@@@@%*=.         -="
-          echo "                     .:=#@@@@@@@@@@#.     :+%@@@@@@@#=:"
-          echo "                          .--+**=-.          ..=*%@@@@@%*+-."
-          echo "                                                   :=*%@@@@@%*=-."
-          echo "                                                       .=*%@@@@@@%+:"
-          echo "                                                           .-+#@@@@@@%*=."
-          echo "                                                                .=*%@@@@@@@%*#%*"
-          echo
-          echo "- $(rustc --version)"
-          echo "- $(cargo --version)"
-          echo
-        '';
-      };
-    });
+        devShells.default = mkShell {
+          name = "${cargoToml.package.name}-${cargoToml.package.version}";
+
+          buildInputs = rust-toolchain ++ ssl-toolchain
+            ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
+            [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ];
+
+          shellHook = ''
+            echo
+            echo "                                       ....                              ..=#%#."
+            echo "                                    .+%@@@#                            -*@@@@@@:"
+            echo "                       :.          =@@*@@@+.=++-                     .#@@=+@@@%."
+            echo "                    =%@@#        :@@%:-@@@%@@#=.         ...       :#@@@:.#@@#."
+            echo "                    #@@@+        -@@. #@@@%-      :=+#%@@@@@%-     %@@@%+@@%-"
+            echo "                    :=.           :. :@@@=     :*@@@@%++++*%%*    .@@@@@%=."
+            echo " :=*#%%**+--..--       :=***+=-:.    =*-    -*%@@@@@%*+=-.         :=--"
+            echo "*%#****%@@@@@@@@=.   +%@%*#%@@@@@@#**%#    *@@@@@@%%%@@@@@@+."
+            echo "        .-#@@@@@@@%+:.      .:+%@@@@@@@*-.  . ..       :+%@@%."
+            echo "           .@@@@@@@@@@%*=.      .=#@@@@@@@%*=:            .+@#."
+            echo "            ..   .-+%@@@@@@#*=:. .-@#+=*%@@@@@@%*=.         -="
+            echo "                     .:=#@@@@@@@@@@#.     :+%@@@@@@@#=:"
+            echo "                          .--+**=-.          ..=*%@@@@@%*+-."
+            echo "                                                   :=*%@@@@@%*=-."
+            echo "                                                       .=*%@@@@@@%+:"
+            echo "                                                           .-+#@@@@@@%*=."
+            echo "The near Moon eclipses the far Sun.                             .=*%@@@@@@@%*#%*"
+            echo
+            echo "- $(rustc --version)"
+            echo "- $(cargo --version)"
+            echo
+          '';
+        };
+      });
 }