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

[20.03] aws-sdk-cpp, boost: fix cmake installs #87032

Merged
merged 2 commits into from May 20, 2020

Conversation

@bhipple
Copy link
Contributor

bhipple commented May 6, 2020

Backports PR #85254, which fixes broken
pkg-config files and development scripts.

thequux added 2 commits Apr 14, 2020
AWS's SDK by default tries to prepend its install root to each of the
library paths; this obviously fails with the absolute paths that Nix
gives it. Worse, it computes the installation root by walking up the
filesystem from its cmake file, so even if the AWSSDK_ROOT_DIR is
explicitly set to the root directory, it gets replaced with the path
to the derivation's dev output.

This is all fixed with a patch to the cmake files that generate the
installed configuration.

Once this is fixed, it *still* doesn't work because the export
generator built into cmake insists on adding `$out/include` to the
header search path; when importing this configuration in another
package, cmake will fail because `$out/include` doesn't exist (After
all, it was relocated by a fixup hook). A small postFixupHook will
recreate the directory and make cmake happy.

(cherry picked from commit 9d78852)
Boost generates its installed cmake configuration using custom logic
in its own build system; while this logic *knows* where it should be
installed, the generated config overrides the correct information with
new paths based on the location of the cmake configuration file in an
attempt to let the package be relocated after installation.

This patch simply undoes that.

(cherry picked from commit 777df0b)
@bhipple
Copy link
Contributor Author

bhipple commented May 9, 2020

CC @worldofpeace this should be a pretty simple bugfix to the aws-sdk-cpp and boost development files (which are currently broken), any objection to merging?

@bhipple
Copy link
Contributor Author

bhipple commented May 19, 2020

Result of nixpkgs-review pr 87032 1

3 packages marked as broken and skipped:
- nix-exec
- rippled-validator-keys-tool
- vulnix
2 packages blacklisted:
- tests.nixos-functions.nixos-test
- tests.nixos-functions.nixosTest-test
1 package failed to build:
- python38Packages.nixpkgs
48 packages built:
- aws-sdk-cpp
- boost170
- boost171 (boost17x)
- bundix
- cabal2nix
- cachix
- common-updater-scripts
- crystal2nix
- dep2nix
- disnix
- disnixos
- fusionInventory
- go2nix
- haskellPackages.cachix
- haskellPackages.nix-paths
- hydra-migration
- hydra-unstable
- lispPackages.quicklisp-to-nix
- lispPackages.quicklisp-to-nix-system-info
- nix (nixStable)
- nix-bundle
- nix-du
- nix-index
- nix-pin
- nix-plugins
- nix-prefetch
- nix-prefetch-bzr
- nix-prefetch-cvs
- nix-prefetch-docker
- nix-prefetch-git
- nix-prefetch-hg
- nix-prefetch-scripts
- nix-prefetch-svn
- nix-serve
- nix-update-source
- nixFlakes
- nixUnstable
- nixos-generators
- nixpkgs-review
- nixui
- pantheon.nixpkgs-github-update
- python37Packages.nixpkgs
- python37Packages.pythonix
- python38Packages.pythonix
- qmediathekview
- rippled
- vgo2nix
- zcash
@bhipple
Copy link
Contributor Author

bhipple commented May 20, 2020

python38Packages.nixpkgs is currently failing on 20.03:
https://hydra.nixos.org/build/118958069

The rest of this just fixes some builds.

@bhipple bhipple merged commit afb1e72 into NixOS:release-20.03 May 20, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
aws-sdk-cpp, aws-sdk-cpp.passthru.tests, boost, boost.passthru.tests on aarch64-linux Success
Details
aws-sdk-cpp, aws-sdk-cpp.passthru.tests, boost, boost.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="3832192"; rev="3832192769752f5ab7102ac418244221f5f44529"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.