From e4ef531f7da7a7345eba103190d363b6f0c88f5a Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Fri, 26 Feb 2021 19:00:39 -0500
Subject: [PATCH] Fix Mac and Linux stock plugins paths

---
 common/paths.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/paths.cpp b/common/paths.cpp
index 2bc68caeba..9b2733339e 100644
--- a/common/paths.cpp
+++ b/common/paths.cpp
@@ -167,15 +167,14 @@ wxString PATHS::GetStockPluginsPath()
     wxFileName fn;
 
 #if defined( __WXMAC__ )
-    fn.Assign( Pgm().GetExecutablePath() );
-    fn.AppendDir( wxT( "Contents" ) );
-    fn.AppendDir( wxT( "PlugIns" ) );
+    fn.Assign( PATHS::GetOSXKicadDataDir() );
+    fn.AppendDir( wxT( "plugins" ) );
 #elif defined( __WXMSW__ )
     fn.Assign( Pgm().GetExecutablePath() + wxT( "/plugins/" ) );
 #else
     // PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
     // corresponding to the install path used for constructing KICAD_USER_PLUGIN
-    wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR );
+    wxString tfname = wxString::FromUTF8Unchecked( KICAD_DATA );
     fn.Assign( tfname, "" );
     fn.AppendDir( "kicad" );    // linux use lowercase
     fn.AppendDir( wxT( "plugins" ) );
@@ -286,4 +285,4 @@ wxString PATHS::GetOSXKicadDataDir()
 
     return ddir.GetPath();
 }
-#endif
\ No newline at end of file
+#endif