mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-14 19:30:21 +00:00
7d6cf9c926
It does no longer rebuild as expected:
> nix-instantiate --eval -E 'with import ./. {}; kicad.base.drvPath'
"/nix/store/8b0wimhxyr3vlbxsr8xybnzaz06161k5-kicad-base-10.0.3.drv"
> nix-instantiate --eval -E 'with import ./. {}; (kicad.override { compressStep = false; }).base.drvPath'
"/nix/store/8b0wimhxyr3vlbxsr8xybnzaz06161k5-kicad-base-10.0.3.drv"
26 lines
781 B
Diff
26 lines
781 B
Diff
diff --git a/common/paths.cpp b/common/paths.cpp
|
|
--- a/common/paths.cpp
|
|
+++ b/common/paths.cpp
|
|
@@ -151,6 +151,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
|
|
{
|
|
wxString path;
|
|
|
|
+ if( wxGetEnv( wxT( "NIX_KICAD10_STOCK_DATA_PATH" ), &path ) ) {
|
|
+ return path;
|
|
+ }
|
|
+
|
|
if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
|
|
{
|
|
// Allow debugging from build dir by placing relevant files/folders in the build root
|
|
@@ -198,6 +202,10 @@ wxString PATHS::GetStockEDALibraryPath()
|
|
{
|
|
wxString path;
|
|
|
|
+ if( wxGetEnv( wxT( "NIX_KICAD10_STOCK_DATA_PATH" ), &path ) ) {
|
|
+ return path;
|
|
+ }
|
|
+
|
|
#if defined( __WXMAC__ )
|
|
path = GetOSXKicadMachineDataDir();
|
|
#elif defined( __WXMSW__ )
|