From c31e556482ca2b48b01dd8a2ba72e8b9c741d51d Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 28 Dec 2022 04:14:07 +0000
Subject: [PATCH] Get bundix working for the most part

---
 flake.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3020bb503..8d474e93c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,9 +14,9 @@
     };
     overlay = final: prev: rec {
       ruby = final.${rubyVer};
-      bundler = prev.bundler.override { inherit ruby; };
+      bundler = prev.bundler.override { ruby = final.ruby; };
       # Rev with Ruby 3 compat
-      bundix = (prev.bundix.override { inherit bundler; }).overrideAttrs (prev: {
+      bundix = (prev.bundix.override { bundler = final.bundler; }).overrideAttrs (prev: {
         src = final.fetchFromGitHub {
           owner = "nix-community";
           repo = "bundix";
@@ -24,7 +24,7 @@
           sha256 = "sha256-0CMDJR3xfewNuDthm3fEh6UPeRH9PURYxJ0PI1WPv4U=";
         };
       });
-      danbooru = bundlerEnv final ruby;
+      danbooru = bundlerEnv final final.ruby;
     };
     pkgs = (import nixpkgs {
       inherit system;
@@ -32,17 +32,19 @@
     });
   in {
     devShells.${system} = {
-      default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          ruby_3_1 postgresql git redis curl nginx openssl coreutils ffmpeg gcc exiftool glib pkg-config
-        ];
-        shellHook = ''
-          PS1="(deps) $PS1"
-        '';
-      };
       bundix = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          bundix postgresql pkg-config
+        NIX_PATH = "nixpkgs=${nixpkgs}";
+        buildInputs = let
+          bundix = pkgs.writeShellScriptBin "bundix" ''
+            exec ${pkgs.bundix}/bin/bundix --ruby=${rubyVer} --gemset=gemset.nix "$@"
+          '';
+        in [
+          pkgs.ruby
+          pkgs.bundler
+          bundix
+          pkgs.postgresql
+          pkgs.pkg-config
+          pkgs.glib
         ];
         shellHook = ''
           PS1="(bundix) $PS1"