From d48897c72daa6acb270c5b815d17860908da99f2 Mon Sep 17 00:00:00 2001 From: langsjo <104687438+langsjo@users.noreply.github.com> Date: Fri, 18 Jul 2025 02:42:12 +0300 Subject: [PATCH] jsduck: rename `env` used for `bundlerEnv` to `rubyEnv` `env` is now only allowed to be an attribute set in `stdenv.mkDerivation` --- pkgs/by-name/js/jsduck/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/js/jsduck/package.nix b/pkgs/by-name/js/jsduck/package.nix index b38f3fb15e79..ccd1538e4f77 100644 --- a/pkgs/by-name/js/jsduck/package.nix +++ b/pkgs/by-name/js/jsduck/package.nix @@ -5,26 +5,26 @@ makeWrapper, bundlerUpdateScript, }: - -stdenv.mkDerivation rec { - pname = "jsduck"; - version = (import ./gemset.nix).jsduck.version; - - env = bundlerEnv { - name = pname; +let + rubyEnv = bundlerEnv { + name = "jsduck"; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; }; +in +stdenv.mkDerivation { + pname = "jsduck"; + version = (import ./gemset.nix).jsduck.version; dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ env ]; + buildInputs = [ rubyEnv ]; installPhase = '' mkdir -p $out/bin - makeWrapper ${env}/bin/jsduck $out/bin/jsduck + makeWrapper ${rubyEnv}/bin/jsduck $out/bin/jsduck ''; passthru.updateScript = bundlerUpdateScript "jsduck";