Skip to content

liblinear: fix static build#136849

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
elohmeier:liblinear-static
Sep 7, 2021
Merged

liblinear: fix static build#136849
Mic92 merged 1 commit intoNixOS:masterfrom
elohmeier:liblinear-static

Conversation

@elohmeier
Copy link
Contributor

@elohmeier elohmeier commented Sep 6, 2021

Motivation for this change

Fixes the build of liblinear, allowing the static compilation of e.g. nmap.

Things done

Updated the static overlay, tested compilation & execution of dependant nmap.

nmap can be compiled using nix-build -A pkgsStatic.nmap.

  • 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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 6, 2021
@Mic92 Mic92 merged commit 26c1027 into NixOS:master Sep 7, 2021
vcunat added a commit that referenced this pull request Sep 7, 2021
Conflicts:
 - pkgs/development/python-modules/pathspec/default.nix
   The hashes are equivalent, so it's not a real conflict.
 - pkgs/top-level/static.nix
   I can't see a solution, deffered redoing this to the later PR:
   #136849
@vcunat
Copy link
Member

vcunat commented Sep 7, 2021

I'm afraid this clashed with #134923

I couldn't immediately see how fix liblinear without static.nix... @elohmeier + @Ericson2314: can you look into that? This PR's change effectively disappeared as of commit 09f5763, i.e. in the staging-next branch at this moment. (I don't think it can get merged to master for the next few days.)

@elohmeier elohmeier deleted the liblinear-static branch September 18, 2021 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants