From 68f1182b659a8ea57c78d8e94d74f803065cac24 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 18 Jan 2023 11:55:26 +0900
Subject: [PATCH] stdenv: don't clobber useArray and type in
{prepend,append}ToVar
Some other packages, for example ruby gems via buildRubyGem, use a
variable called "type" internally, which is overwritten here and
causes failures like:
failure: $gempkg path unspecified
Fix for changes in 11c3127e38dafdf95ca71a85b1591a29b67e0c09.
---
pkgs/stdenv/generic/setup.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 1d95c65718b8..b1b982ecdffc 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -206,8 +206,8 @@ addToSearchPath() {
# syntax when they switch to setting __structuredAttrs = true.
prependToVar() {
local -n nameref="$1"
+ local useArray type
- useArray=
if [ -n "$__structuredAttrs" ]; then
useArray=true
else
@@ -239,8 +239,8 @@ prependToVar() {
# Same as above
appendToVar() {
local -n nameref="$1"
+ local useArray type
- useArray=
if [ -n "$__structuredAttrs" ]; then
useArray=true
else