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

openexr, imlbase: unbreak on macOS #86329

Merged
merged 1 commit into from May 1, 2020
Merged

Conversation

@mikesperber
Copy link
Contributor

mikesperber commented Apr 29, 2020

With the default configuration, the libraries are generated with a
-2_4.24.dylib suffix, and linking with -l...-2_4 doesn't work. Pass
the configure option to turn off the suffix.

Motivation for this change

openexr did not build on macOS, as it couldn't find the ilmbase libraries.

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.
With the default configuration, the libraries are generated with a
-2_4.24.dylib suffix, and linking with -l...-2_4  doesn't work.  Pass
the configure option to turn off the suffix.
@veprbl
Copy link
Member

veprbl commented Apr 29, 2020

This will conflict with #86241 that in staging now. We could merge this to master as this doesn't seem to cause as much rebuild.

@flokli
Copy link
Contributor

flokli commented Apr 30, 2020

IIRC, the breakage only was introduced in #86085, and fixing it by using cmake as proposed in #86241 is much cleaner.

We shouldn't complicate merging master back into staging more than necessary - the fixes should probably land in #86330 soon.

@veprbl
Copy link
Member

veprbl commented May 1, 2020

We shouldn't complicate merging master back into staging more than necessary

I was assuming that the person who would merge this, would also merge master to staging. Assuming there is no other conflict this could go as:

  1. merge master to staging
  2. merge this PR to master
  3. merge master to staging again, get the conflict
  4. git checkout origin/staging -- pkgs/development/libraries/openexr/default.nix pkgs/development/libraries/ilmbase/default.nix
  5. git merge --continue
@flokli
Copy link
Contributor

flokli commented May 1, 2020

Let's merge this to unbreak master.

@flokli flokli merged commit 32fbb42 into NixOS:master May 1, 2020
11 of 13 checks passed
11 of 13 checks passed
grahamcofborg-eval Calculating Changed Outputs
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./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="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="8532d16"; rev="8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342"; } ./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
@FRidh
Copy link
Member

FRidh commented May 2, 2020

Reverted this change when merging to staging-next to avoid the merge conflict. If the issue is not fixed on staging-next, please fix it there.

@FRidh FRidh mentioned this pull request May 2, 2020
0 of 10 tasks complete
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

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