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

gpm: fix static build #144909

Merged
merged 5 commits into from
May 1, 2022
Merged

gpm: fix static build #144909

merged 5 commits into from
May 1, 2022

Conversation

KAction
Copy link
Contributor

@KAction KAction commented Nov 6, 2021

Patch I developed to add support for static build into upstream build system do
not apply cleanly on 1.20.7 release, so instead of backporting it, I decided to
switch to git snapshot instead. It allowed to get rid of three other patches
in nix expression, since they are applied upstream.
=> telmich/gpm#42

I requested proper release, but chance seems to be slim.
=> telmich/gpm#33

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Patch I developed to add support for static build into upstream build system do
not apply cleanly on 1.20.7 release, so instead of backporting it, I decided to
switch to git snapshot instead.  It allowed to get rid of three other patches
in nix expression, since they are applied upstream.
=> telmich/gpm#42

I requested proper release, but chance seems to be slim.
=> telmich/gpm#33
pkgs/servers/gpm/default.nix Outdated Show resolved Hide resolved
pkgs/servers/gpm/default.nix Outdated Show resolved Hide resolved
@@ -51,13 +38,15 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
(if ncurses == null then "--without-curses" else "--with-curses")
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
(if ncurses == null then "--without-curses" else "--with-curses")
(if withNcurses then "--without-curses" else "--with-curses")

pkgs/servers/gpm/default.nix Show resolved Hide resolved
KAction and others added 2 commits November 11, 2021 18:31
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@KAction
Copy link
Contributor Author

KAction commented Nov 11, 2021

I am okay with addition of withNcurses parameter, but wouldn't it be better to have it in separate pr?

@KAction
Copy link
Contributor Author

KAction commented Dec 5, 2021

@SuperSandro2000 ?

Dmitry Bogatov and others added 2 commits April 30, 2022 23:01
Co-authored-by: Alyssa Ross <hi@alyssa.is>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@alyssais alyssais merged commit 5e831c7 into NixOS:master May 1, 2022
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.

3 participants