wxGTK3{1,2,3}: fix darwin build failure; audacity: fix darwin build failure (#459646)
This commit is contained in:
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
mkdir src/private
|
||||
substituteInPlace scripts/build/macOS/fix_bundle.py \
|
||||
--replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
|
||||
--replace-fail "path.startswith('/usr/lib/')" "path.startswith('/usr/lib/') or path.startswith('${builtins.storeDir}')"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace libraries/lib-files/FileNames.cpp \
|
||||
|
||||
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withPrivateFonts "--enable-privatefonts"
|
||||
++ lib.optional withMesa "--with-opengl"
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
|
||||
"--with-osx_cocoa"
|
||||
"--with-libiconv"
|
||||
]
|
||||
|
||||
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional unicode "--enable-unicode"
|
||||
++ lib.optional withMesa "--with-opengl"
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
|
||||
"--with-osx_cocoa"
|
||||
"--with-libiconv"
|
||||
"--with-urlsession" # for wxWebRequest
|
||||
|
||||
@@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optional withMesa "--with-opengl"
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}"
|
||||
"--with-osx_cocoa"
|
||||
"--with-libiconv"
|
||||
"--with-urlsession" # for wxWebRequest
|
||||
|
||||
Reference in New Issue
Block a user