From 96fad8043983c38c75de10cf29d5a49c61803031 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 28 Dec 2022 04:54:32 +0000
Subject: [PATCH] Switch to bundlerApp

---
 flake.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2caaeccfc..c91671d19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
   let
     system = "x86_64-linux";
     rubyVer = "ruby_3_1";
-    bundlerEnv = pkgs: ruby: pkgs.bundlerEnv {
+    bundlerApp = pkgs: ruby: pkgs.bundlerApp {
       pname = "danbooru";
       inherit ruby;
       gemdir = ./.;
@@ -25,7 +25,7 @@
           sha256 = "sha256-0CMDJR3xfewNuDthm3fEh6UPeRH9PURYxJ0PI1WPv4U=";
         };
       });
-      danbooru = bundlerEnv final final.ruby;
+      danbooru = bundlerApp final final.ruby;
     };
     pkgs = (import nixpkgs {
       inherit system;
@@ -52,17 +52,10 @@
         '';
       };
     };
-    packages.${system}.default =
-    let
-      gems = pkgs.bundlerEnv {
-        name = "danbooru";
-        ruby = pkgs.ruby;
-        gemdir = ./.;
-      };
-    in pkgs.stdenv.mkDerivation {
+    packages.${system}.default = pkgs.stdenv.mkDerivation {
       name = "danbooru";
       src = ./.;
-      buildInputs = [ gems pkgs.ruby pkgs.pkg-config pkgs.glib ];
+      buildInputs = [ pkgs.danbooru pkgs.ruby pkgs.pkg-config pkgs.glib ];
       installPhase = ''
         mkdir -p $out
         cp -r $src $out