From 871975a5974178714d8a86837f3d92d2cf292bad Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 27 Apr 2023 08:04:39 +0000
Subject: [PATCH] mx-sanebot: split shell and default out of flake.nix

---
 pkgs/mx-sanebot/default.nix | 19 +++++++++++++++++++
 pkgs/mx-sanebot/flake.nix   | 29 ++---------------------------
 pkgs/mx-sanebot/shell.nix   | 13 +++++++++++++
 3 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/mx-sanebot/default.nix
 create mode 100644 pkgs/mx-sanebot/shell.nix

diff --git a/pkgs/mx-sanebot/default.nix b/pkgs/mx-sanebot/default.nix
new file mode 100644
index 00000000..41c898f0
--- /dev/null
+++ b/pkgs/mx-sanebot/default.nix
@@ -0,0 +1,19 @@
+{ lib
+, cargo-docset ? null
+, openssl
+, pkg-config
+, rustPlatform
+}:
+
+# docs: <nixpkgs>/doc/languages-frameworks/rust.section.md
+rustPlatform.buildRustPackage {
+  name = "mx-sanebot";
+  src = ./.;
+  cargoLock.lockFile = ./Cargo.lock;
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optional (cargo-docset != null) cargo-docset;
+  buildInputs = [ openssl ];
+
+  # enables debug builds, if we want: https://github.com/NixOS/nixpkgs/issues/60919.
+  hardeningDisable = [ "fortify" ];
+}
diff --git a/pkgs/mx-sanebot/flake.nix b/pkgs/mx-sanebot/flake.nix
index 1c10064c..122c123a 100644
--- a/pkgs/mx-sanebot/flake.nix
+++ b/pkgs/mx-sanebot/flake.nix
@@ -11,35 +11,10 @@
       pkgs = import nixpkgs {
         inherit system;
       };
-      nativeBuildInputs = with pkgs; [
-        pkg-config
-      ];
-      buildInputs = with pkgs; [
-        openssl
-      ];
     in rec {
-      packages = {
-        # docs: <nixpkgs>/doc/languages-frameworks/rust.section.md
-        mx-sanebot = pkgs.rustPlatform.buildRustPackage {
-          name = "mx-sanebot";
-          src = ./.;
-          cargoLock.lockFile = ./Cargo.lock;
-          # enables debug builds, if we want: https://github.com/NixOS/nixpkgs/issues/60919.
-          hardeningDisable = [ "fortify" ];
-          inherit buildInputs nativeBuildInputs;
-        };
-      };
+      packages.mx-sanebot = pkgs.callPackage ./default.nix { };
       defaultPackage = packages.mx-sanebot;
 
-      devShells.default = with pkgs; mkShell {
-        # enables debug builds, if we want: https://github.com/NixOS/nixpkgs/issues/60919.
-        hardeningDisable = [ "fortify" ];
-
-        # Allow cargo to download crates.
-        SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-        inherit buildInputs;
-        nativeBuildInputs = [ cargo ] ++ nativeBuildInputs;
-      };
+      devShells.default = ./shell.nix { inherit pkgs; };
     });
 }
diff --git a/pkgs/mx-sanebot/shell.nix b/pkgs/mx-sanebot/shell.nix
new file mode 100644
index 00000000..1e471b72
--- /dev/null
+++ b/pkgs/mx-sanebot/shell.nix
@@ -0,0 +1,13 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+  mx-sanebot = pkgs.callPackage ./. { };
+in
+  pkgs.mkShell {
+    nativeBuildInputs = mx-sanebot.buildInputs ++ mx-sanebot.nativeBuildInputs ++ [
+      pkgs.cargo
+    ];
+
+    # Allow cargo to download crates.
+    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  }