From 36b1cf2fade5231a6edc6fbf718b806869044b30 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 26 Dec 2025 12:10:53 +0100 Subject: [PATCH] wine: prepare for structuredAttrs --- pkgs/applications/emulators/wine/base.nix | 2 +- pkgs/applications/emulators/wine/builder-wow.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 034130c88b6c..4343843d42a8 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation ( # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = toString ( + env.NIX_LDFLAGS = toString ( map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ finalAttrs.buildInputs) # libpulsecommon.so is linked but not found otherwise diff --git a/pkgs/applications/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index faf4f2c30748..d5325a9a9889 100644 --- a/pkgs/applications/emulators/wine/builder-wow.sh +++ b/pkgs/applications/emulators/wine/builder-wow.sh @@ -1,5 +1,5 @@ ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64 -preFlags="${configureFlags}" +preFlags="${configureFlags[@]}" unpackPhase cd $TMP/$sourceRoot @@ -10,7 +10,7 @@ mkdir -p $TMP/wine-wow $TMP/wine64 cd $TMP/wine64 sourceRoot=`pwd` -configureFlags="${preFlags} --enable-win64" +configureFlags=($preFlags --enable-win64) configurePhase buildPhase # checkPhase @@ -37,7 +37,7 @@ PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}") cd $TMP/wine-wow sourceRoot=`pwd` -configureFlags="${preFlags} --with-wine64=../wine64" +configureFlags=($preFlags --with-wine64=../wine64) configurePhase buildPhase # checkPhase