Switch to bundlerApp

This commit is contained in:
2022-12-28 04:54:32 +00:00
parent 2038808eb0
commit 96fad80439

View File

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