Skip to content

kicad: fix build#93578

Merged
veprbl merged 2 commits intoNixOS:masterfrom
evils:kicad-fix
Jul 24, 2020
Merged

kicad: fix build#93578
veprbl merged 2 commits intoNixOS:masterfrom
evils:kicad-fix

Conversation

@evils
Copy link
Member

@evils evils commented Jul 21, 2020

Motivation for this change

#92261 broke the build via wxPython
and apparently makeWrapper wasn't passed in explicitly

Things done
  • disabled scriptingSupport by default, it pulls in wxPython, and that's broken

  • add makeWrapper to nativeBuildInputs

  • bump kicad-unstable to the latest master commit (and checked if it works somewhat)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)

  • Built on platform(s)

    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)

  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"

  • Tested execution of all binary files (usually in ./result/bin/)

  • Determined the impact on package closure size (by running nix path-info -S before and after)

  • Ensured that relevant documentation is up to date

  • Fits CONTRIBUTING.md.

evils added 2 commits July 21, 2020 08:46
disable scripting support as 92261 broke wxPython_4_0
  and i haven't managed to get wxPython 4.1 to work

something caused makeWrapper to have to be added on its own
  not sure where it came from before...

and some cleanup
@ofborg ofborg bot requested review from Kiwi and berce July 21, 2020 07:36
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 21, 2020
@veprbl
Copy link
Member

veprbl commented Jul 21, 2020

@GrahamcOfBorg build kicad-small kicad-unstable-small

Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@veprbl veprbl merged commit b6863cb into NixOS:master Jul 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants