From 1224274f248094cfa3c3310693e4221f4d28145d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 23 Mar 2026 12:42:25 +0100 Subject: [PATCH] rubyPackages: move env variables into env for structuredAttrs --- pkgs/development/ruby-modules/gem-config/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b95cca64c699..afd3674a4788 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -262,7 +262,9 @@ in }; dep-selector-libgecode = attrs: { - USE_SYSTEM_GECODE = true; + env = attrs.env or { } // { + USE_SYSTEM_GECODE = true; + }; postInstall = '' installPath=$(cat $out/nix-support/gem-meta/install-path) sed -i $installPath/lib/dep-selector-libgecode.rb -e 's@VENDORED_GECODE_DIR =.*@VENDORED_GECODE_DIR = "${gecode_3}"@' @@ -326,7 +328,9 @@ in }; mimemagic = attrs: { - FREEDESKTOP_MIME_TYPES_PATH = "${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; + env = attrs.env or { } // { + FREEDESKTOP_MIME_TYPES_PATH = "${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; + }; }; mini_magick = attrs: { @@ -1028,7 +1032,9 @@ in sassc = attrs: { nativeBuildInputs = [ rake ]; dontBuild = false; - SASS_LIBSASS_PATH = toString libsass; + env = attrs.env or { } // { + SASS_LIBSASS_PATH = toString libsass; + }; postPatch = '' substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'