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.

Sign up for GitHub

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

Jump to bottom

freeciv_qt: init at 2.6.0 #63760

Merged
merged 1 commit into from Jun 25, 2019
Merged

freeciv_qt: init at 2.6.0 #63760

merged 1 commit into from Jun 25, 2019

Conversation

peterhoeg
Copy link
Member

Motivation for this change

FreeCiv has a nice Qt5 frontend - let's support that.

A few other bits:

  1. Move from gtk2 to gtk3 for the GTK client
  2. Use system lua instead of building it each time
  3. Upstream has moved to github from sourceforge
  4. name -> pname

Cc: @nbp

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@peterhoeg peterhoeg mentioned this pull request Jun 25, 2019
Closed
10 tasks
@ofborg ofborg bot requested a review from nbp June 25, 2019 05:11
@lightbulbjim
Copy link
Contributor

All three clients are giving me an error when trying to build on NixOS:
./generate_specenum.py: /usr/bin/env: bad interpreter: No such file or directory

@peterhoeg
Copy link
Member Author

It builds fine in a sandbox here - how strange.

@lightbulbjim
Copy link
Contributor

Yeah, not sure what's going on. I tried adding various versions of Python to nativeBuildInputs but it didn't fix it. I'm also running it in sandbox mode.

Still tinkering...

@peterhoeg
Copy link
Member Author

Oh, I know. The autoreconfHook was added after because I was trying to make it discover qt5 on its own. Turns out that means the python script is run during build now which fails due to no /usr/bin/env. Give me 5 minutes.

@peterhoeg
Copy link
Member Author

That was it.

@lightbulbjim
Copy link
Contributor

Working now - all clients build and run for me on NixOS.

@peterhoeg peterhoeg merged commit a2075a2 into NixOS:master Jun 25, 2019
@peterhoeg peterhoeg deleted the f/freeciv branch June 25, 2019 08:20
@peterhoeg peterhoeg restored the f/freeciv branch June 25, 2019 08:51
@peterhoeg peterhoeg deleted the f/freeciv branch June 26, 2019 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@peterhoeg @lightbulbjim