Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kicad: include desktop, icon and mime files #119055

Merged
merged 2 commits into from Apr 21, 2021
Merged

kicad: include desktop, icon and mime files #119055

merged 2 commits into from Apr 21, 2021

Conversation

eduardosm
Copy link
Contributor

@eduardosm eduardosm commented Apr 10, 2021

Motivation for this change

Fixes #106295.

Things done
  • 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.

])
)
;

postInstall = ''
install -d $out/share
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
install -d $out/share
mkdir -p $out/share

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed

@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 10, 2021

Result of nixpkgs-review pr 119055 at 427edc8 run on aarch64-linux 1

2 packages built successfully:
  • kicad-small
  • kicad-unstable-small
1 suggestion:
  • warning: unclear-gpl

    agpl3 is a deprecated license, please check if project uses agpl3Plus or agpl3Only and change meta.license accordingly.

    Near pkgs/applications/science/electronics/kicad/default.nix:262:5:

        |
    262 |     license = lib.licenses.agpl3;
        |     ^
    

Copy link
Member

@evils evils left a comment

Choose a reason for hiding this comment

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

sorry i didn't get around to addressing your issue

@@ -216,6 +216,8 @@ stdenv.mkDerivation rec {
in
(concatStringsSep "\n"
(flatten [
"runHook preInstall"
Copy link
Member

Choose a reason for hiding this comment

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

what's up with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hooks need to be explicitly called by the installPhase script. Even if there isn't a preInstall hook, users may define their own using overrideAttrs.
https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-phase-hooks.md

@@ -227,10 +229,19 @@ stdenv.mkDerivation rec {

# link in the CLI utils
(map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils)

"runHook postInstall"
Copy link
Member

Choose a reason for hiding this comment

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

any idea why this has to be added explicitly?

Copy link
Member

Choose a reason for hiding this comment

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

Because you are overwriting the phase that normally runs those.

@ofborg ofborg bot requested a review from evils April 10, 2021 18:48
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

LGTM

@evils LGTY? nvm, should have read the above more closely.

@SuperSandro2000
Copy link
Member

@ofborg eval

@ofborg ofborg bot requested a review from evils April 21, 2021 04:05
@SuperSandro2000 SuperSandro2000 merged commit 59f840f into NixOS:master Apr 21, 2021
@eduardosm eduardosm deleted the kicad branch April 21, 2021 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing menu entry to launch kicad
4 participants