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

Ocaml packages fix build on darwin #209132

Merged
merged 11 commits into from
Jan 12, 2023

Conversation

Et7f3
Copy link
Contributor

@Et7f3 Et7f3 commented Jan 5, 2023

Description of changes

While testing #197367 I saw that many other package was broken with the same kind of error so I did a pass to fix the same error in multiple packages.
build log before this PR:

error: builder for '/nix/store/vihic2dgbd98lrl0sas2c647c6fz7dsz-ocaml-libvirt-0.6.1.5.drv' failed with exit code 2;
       last 10 log lines:
       > like 'CDEFLMPSUVYZX', is deprecated.
       > Use the equivalent signed form: +C+D+E+F+L+M+P+S+U+V+Y+Z+X-3.
       > Hint: Enabling or disabling a warning by its mnemonic name requires a + or - prefix.
       > Hint: Did you make a spelling mistake when using a mnemonic name?
       > ocamlmklib -o mllibvirt libvirt_c.o libvirt.cmo libvirt_version.cmo -L/nix/store/nv200j8plka6f5knmnsx8wqx7736pq43-libvirt-8.10.0/lib -lvirt
       > ld: file not found: /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation for architecture x86_64
       > clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
       > make[1]: *** [Makefile:68: mllibvirt.cma] Error 2
       > make[1]: Leaving directory '/private/tmp/nix-build-ocaml-libvirt-0.6.1.5.drv-0/source/libvirt'
       > make: *** [Makefile:31: all] Error 1
       For full logs, run 'nix log /nix/store/vihic2dgbd98lrl0sas2c647c6fz7dsz-ocaml-libvirt-0.6.1.5.drv'.
Things done

copied from what is done with cairo2

For reviewer:

nix build .#ocamlPackages.bjack .#ocamlPackages.ffmpeg .#ocamlPackages.ffmpeg-av .#ocamlPackages.ffmpeg-avcodec .#ocamlPackages.ffmpeg-avdevice .#ocamlPackages.ffmpeg-avfilter .#ocamlPackages.ffmpeg-avutil .#ocamlPackages.ffmpeg-swresample .#ocamlPackages.ffmpeg-swscale .#ocamlPackages.gstreamer .#ocamlPackages.labltk .#ocamlPackages.ocaml_libvirt

(might be quicker than nixpkgs-review)

  • 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 rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 5, 2023
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }:
{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does I profit of this PR to split deps on each line and sort them ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer it to be in a separate PR whose name starts with treewide.

@wegank
Copy link
Member

wegank commented Jan 9, 2023

@ofborg build ocamlPackages.ocaml_libvirt ocamlPackages.labltk ocamlPackages.gstreamer ocamlPackages.ffmpeg-avutil ocamlPackages.bjack ocamlPackages.ffmpeg-avcodec ocamlPackages.ffmpeg-avfilter ocamlPackages.ffmpeg-swscale ocamlPackages.ffmpeg-av ocamlPackages.ffmpeg-avdevice ocamlPackages.ffmpeg-swresample

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/794

@SuperSandro2000 SuperSandro2000 merged commit e7d3753 into NixOS:master Jan 12, 2023
@Et7f3 Et7f3 deleted the ocamlPackages_fix_build_on_darwin branch January 12, 2023 23:26
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.

None yet

4 participants