Unverified Commit 0d7a62e3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

wxGTK3{1,2,3}: fix darwin build failure; audacity: fix darwin build failure (#459646)

parents ed6225bd cd1230cb

pkgs/by-name/au/audacity/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 \

pkgs/by-name/wx/wxGTK31/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -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"

  ]

pkgs/by-name/wx/wxGTK32/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/wx/wxwidgets_3_3/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -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