pyrox.dev
wineWow64Packages: fix build on Darwin
+7
-4
pkgs/applications/emulators/wine/base.nix
+7
-4
pkgs/applications/emulators/wine/base.nix
···
37
37
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
38
38
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
39
39
# rebuild it with empty NIX_LDFLAGS.
40
-
rm loader/wine64-preloader
41
-
make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}=""
40
+
for preloader in wine-preloader wine64-preloader; do
41
+
rm loader/$preloader &> /dev/null \
42
+
&& ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \
43
+
|| echo "loader/$preloader not built, skipping relink."
44
+
done
42
45
'';
43
46
}) // rec {
44
47
inherit version src;
···
109
112
# uses property syntax in one place. The first patch is necessary only with older
110
113
# versions of Wine. The second is needed on all versions of Wine.
111
114
(lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch)
112
-
(lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.19.patch)
113
-
./darwin-metal-compat.patch
115
+
(lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch)
116
+
(lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch)
114
117
# Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.
115
118
./darwin-qos.patch
116
119
]