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

organicmaps: init at 2021-05-15 #123259

Merged
merged 7 commits into from Mar 27, 2022
Merged

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented May 16, 2021

Motivation for this change

A good offline map app

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.

Upstream feedback about the patches has been provided: organicmaps/organicmaps#395 (comment)

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 16, 2021

Result of nixpkgs-review pr 123259 at 96aa5228 run on aarch64-linux 1

1 package failed to build:

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.


Result of nixpkgs-review pr 123259 at 96aa5228 run on x86_64-linux 1

1 package failed to build:

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

@fgaz fgaz force-pushed the organicmaps/init branch 3 times, most recently from fe8854b to 9c5de20 Compare May 16, 2021 20:58
repo = "organicmaps";
rev = version;
sha256 = "sha256-g5AV72JZjgcWKTBkve1dAi9W9ocdeWAROy+HCrsILLE=";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

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

All the 3party things should be devondered because upstream is most likely behind in security patches.

Copy link
Member Author

Choose a reason for hiding this comment

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

This will be difficult. The project is configured to build those dependencies from source and doesn't detect the system ones. I'd have to patch it upstream, but I'm not very knowledgeable about cmake, so that'd take a while.

Is there a policy for vendored dependencies? There definitely are other packages where we allow it (eg. most of the rust and go based projects).

Copy link
Member Author

Choose a reason for hiding this comment

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

Of course I could also substitute the bundled sources with the .srcs of the ones we have in nixpkgs but that sounds like a massive hack

Copy link
Member

Choose a reason for hiding this comment

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

Is there a policy for vendored dependencies?

Not really it but general distro rule is to not do it unless it is necessary.

There definitely are other packages where we allow it (eg. most of the rust and go based projects).

Those languages are harder or impossible to devendor but c++/cmake projects are usually pretty easy and upstream supports it or we can re-use patches from other distros.

Of course I could also substitute the bundled sources with the .srcs of the ones we have in nixpkgs but that sounds like a massive hack

That would be better than nothing but we would still double compile libraries most likely. Can we link them to the directories where they are supposed to be maybe?

Copy link
Member Author

@fgaz fgaz May 17, 2021

Choose a reason for hiding this comment

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

No patches from other distros, unfortunately :-/. I'll ask the other people in organicmaps/organicmaps#395 if anyone can help, and otherwise I'll postpone this until I have time to learn how to patch their cmake scripts (contributions welcome btw).

Copy link
Member Author

@fgaz fgaz Feb 24, 2022

Choose a reason for hiding this comment

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

Freetype and icu (the biggest dependency I think) are now devendored! organicmaps/organicmaps#395 (comment)

@SuperSandro2000 SuperSandro2000 merged commit 2d67f3a into NixOS:master Mar 27, 2022
@fgaz fgaz deleted the organicmaps/init branch March 27, 2022 16:35
@Artturin
Copy link
Member

more devendoring will be nice as this takes 38 minutes to compile on hydra https://hydra.nixos.org/build/173471779

@fgaz
Copy link
Member Author

fgaz commented Apr 13, 2022

boost is probably the next big package to devendor. unfortunately I don't know much cmake, so any help is appreciated

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.

None yet

5 participants