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

ledger: fix build on darwin #94766

Merged
merged 1 commit into from Aug 6, 2020
Merged

ledger: fix build on darwin #94766

merged 1 commit into from Aug 6, 2020

Conversation

@marsam
Copy link
Contributor

marsam commented Aug 6, 2020

Motivation for this change

Fixes #94755

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.
@ofborg ofborg bot added the 6.topic: darwin label Aug 6, 2020
@ofborg ofborg bot requested a review from jwiegley Aug 6, 2020
@marsam marsam merged commit e31a467 into NixOS:master Aug 6, 2020
19 checks passed
19 checks passed
tests tests
Details
tests
Details
Evaluation Performance Report Evaluator Performance Report
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="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./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="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="744d43f"; rev="744d43f8ef10c11c1c28650d8215635a27a6fb2a"; } ./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
ledger, ledger.passthru.tests on aarch64-linux Success
Details
ledger, ledger.passthru.tests on x86_64-darwin Success
Details
ledger, ledger.passthru.tests on x86_64-linux Success
Details
@marsam marsam deleted the marsam:fix-ledger-darwin branch Aug 6, 2020
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DBUILD_DOCS:BOOL=ON"
(lib.optionalString usePython "-DUSE_PYTHON=true")
] ++ lib.optionals (usePython && stdenv.isDarwin) [
# Fix python lookup on Darwin. Not necessary after
# https://github.com/NixOS/nixpkgs/pull/94090 lands in master

This comment has been minimized.

@purcell

purcell Aug 6, 2020 Contributor

Is this comment correct? That PR has already landed in master, and I believe the ledger build failure I was seeing was with the latest master.

This comment has been minimized.

@marsam

marsam Aug 6, 2020 Author Contributor

it was reverted in 22f82fc, the offending line is still there:

cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags"

I thought it landed into staging, but doesn't seem to be there cc: @matthewbauer

This comment has been minimized.

@purcell

purcell Aug 6, 2020 Contributor

Aha, I see! Thanks.

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.

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