From 74d8b5fe1c1adc5f91e6162ff8dde5b47ec0bebb Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Wed, 28 Dec 2022 05:14:11 +0000 Subject: [PATCH] fix build --- flake.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c91671d19..47d85fa66 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,17 @@ let system = "x86_64-linux"; rubyVer = "ruby_3_1"; - bundlerApp = pkgs: ruby: pkgs.bundlerApp { - pname = "danbooru"; + bundlerEnv = pkgs: ruby: pkgs.bundlerEnv { + name = "danbooru"; inherit ruby; gemdir = ./.; + gemset = + let gems = import ./gemset.nix; + in gems // { + dtext_rb = gems.dtext_rb // { + buildInputs = [ pkgs.pkg-config pkgs.glib ]; + }; + }; buildInputs = [ pkgs.pkg-config pkgs.glib ]; }; overlay = final: prev: rec { @@ -25,7 +32,7 @@ sha256 = "sha256-0CMDJR3xfewNuDthm3fEh6UPeRH9PURYxJ0PI1WPv4U="; }; }); - danbooru = bundlerApp final final.ruby; + danbooru = bundlerEnv final final.ruby; }; pkgs = (import nixpkgs { inherit system;