wxwidgets-kicad-macos init at 3.0.4 #98538
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KiCad uses a patched wxwidgets on macOS. KiCad maintains a repository of wxwidgets with all patches already applied. This package provides wxwidgets solely for KiCad on macOS.
255ecc9 to
1832b2a
Compare
10 tasks
|
Seems like #97101 is aimed at the same goal of providing kicad on macOS and does not require a new package. |
|
#97101 is about building wxPython_4_0 on Darwin/macOS. While wxPython_4_0 is an (optional) depedency for KiCad and the wxWidgets versions of wxPython and KiCad have to match (https://gitlab.com/kicad/code/kicad/-/issues/4431, see also #98634) it does not negate the requirement of a specifcally-patched version of wxWidgets on macOS for KiCad, imho … wxPython_4_0 compiles fine for me on macOS with the wxWidgets-version required by KiCad. I've been doing that for weeks. Edit: I hope the special-patch-situation goes away in the future and KiCad can use a stock wxWidgets on macOS too, but that is a question for the KiCad-devs. |
| , libGLU, libGL | ||
| , compat24 ? false, compat26 ? true | ||
| , setfile, AGL, Carbon, Cocoa, Kernel, QTKit, WebKit, AVFoundation, AVKit | ||
| , ... |
| , ... | ||
| }: | ||
|
|
||
| with stdenv.lib; |
There was a problem hiding this comment.
I am not a fan of this. It would be better to apply this on a smaller scale.
| setfile Kernel QTKit WebKit AVFoundation AVKit AGL | ||
| ]; | ||
|
|
||
| nativeBuildInputs = [ pkgconfig ]; |
There was a problem hiding this comment.
Suggested change
| nativeBuildInputs = [ pkgconfig ]; | |
| nativeBuildInputs = [ pkg-config ]; |
| # purpose of this package. Hopefully, this will eventually go away and KiCad | ||
| # will use a stock wxwidgets on macOS, obviating the need for this packages. | ||
|
|
||
| { stdenv, fetchgit, fetchurl, pkgconfig |
There was a problem hiding this comment.
Suggested change
| { stdenv, fetchgit, fetchurl, pkgconfig | |
| { stdenv, fetchgit, fetchurl, pkg-config |
| [ "--disable-precomp-headers" "--enable-mediactrl" | ||
| (if compat24 then "--enable-compat24" else "--disable-compat24") | ||
| (if compat26 then "--enable-compat26" else "--disable-compat26") | ||
| "--with-cocoa" "--with-macosx-version-min=10.10" |
There was a problem hiding this comment.
Suggested change
| "--with-cocoa" "--with-macosx-version-min=10.10" | |
| "--with-cocoa" "--with-macosx-version-min=10.12" |
We should probably set this to apple_sdk version in darwin dynamically.
Comment on lines
+38
to
+43
| [ "--disable-precomp-headers" "--enable-mediactrl" | ||
| (if compat24 then "--enable-compat24" else "--disable-compat24") | ||
| (if compat26 then "--enable-compat26" else "--disable-compat26") | ||
| "--with-cocoa" "--with-macosx-version-min=10.10" | ||
| "--enable-webview" "--enable-webview-webkit" | ||
| "--enable-unicode" "--with-opengl" |
There was a problem hiding this comment.
Suggested change
| [ "--disable-precomp-headers" "--enable-mediactrl" | |
| (if compat24 then "--enable-compat24" else "--disable-compat24") | |
| (if compat26 then "--enable-compat26" else "--disable-compat26") | |
| "--with-cocoa" "--with-macosx-version-min=10.10" | |
| "--enable-webview" "--enable-webview-webkit" | |
| "--enable-unicode" "--with-opengl" | |
| [ | |
| "--disable-precomp-headers" | |
| (if compat24 then "--enable-compat24" else "--disable-compat24") | |
| (if compat26 then "--enable-compat26" else "--disable-compat26") | |
| "--enable-mediactrl" | |
| "--enable-unicode" | |
| "--enable-webview" | |
| "--enable-webview-webkit" | |
| "--with-cocoa" | |
| "--with-macosx-version-min=10.10" | |
| "--with-opengl" |
Comment on lines
+49
to
+55
| substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' | ||
| substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' | ||
| substituteInPlace configure --replace /usr /no-such-path | ||
| substituteInPlace configure --replace \ | ||
| 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ | ||
| 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' | ||
| substituteInPlace configure --replace "-framework System" -lSystem |
There was a problem hiding this comment.
Suggested change
| substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' | |
| substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' | |
| substituteInPlace configure --replace /usr /no-such-path | |
| substituteInPlace configure --replace \ | |
| 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ | |
| 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' | |
| substituteInPlace configure --replace "-framework System" -lSystem | |
| substituteInPlace configure \ | |
| --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' \ | |
| --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' \ | |
| --replace /usr /no-such-path \ | |
| --replace 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' \ | |
| --replace "-framework System" -lSystem |
| ''; | ||
|
|
||
| postInstall = " | ||
| (cd $out/include && ln -s wx-*/* .) |
There was a problem hiding this comment.
Suggested change
| (cd $out/include && ln -s wx-*/* .) | |
| pushd $out/include | |
| ln -s wx-*/* . | |
| popd |
Comment on lines
+70
to
+75
| meta = rec { | ||
| description = "Patched version of wxWidgets for KiCad on macOS"; | ||
| homepage = "https://gitlab.com/kicad/code/wxWidgets"; | ||
| license = stdenv.lib.licenses.unfree; | ||
| platforms = stdenv.lib.platforms.darwin; | ||
| }; |
There was a problem hiding this comment.
Suggested change
| meta = rec { | |
| description = "Patched version of wxWidgets for KiCad on macOS"; | |
| homepage = "https://gitlab.com/kicad/code/wxWidgets"; | |
| license = stdenv.lib.licenses.unfree; | |
| platforms = stdenv.lib.platforms.darwin; | |
| }; | |
| meta = with stdenv.lib; { | |
| description = "Patched version of wxWidgets for KiCad on macOS"; | |
| homepage = "https://gitlab.com/kicad/code/wxWidgets"; | |
| license = licenses.unfree; | |
| platforms = platforms.darwin; | |
| }; |
|
I don't think we need to reformat this as this is largely a copy-pasta of default.nix. I suppose, it would be better to define this via |
|
I marked this as stale due to inactivity. → More info |
|
Closing due to inactivity from author. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
KiCad uses a patched wxWidgets on macOS. KiCad maintains a branch of
wxWidgets with all patches already applied. This package provides wxWidgets
solely for KiCad on macOS.
See #98450
Possibly interesting here: #90654
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)