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.

Sign up for GitHub

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

Jump to bottom

ocamlPackages.lablgtk3: propagate gtk3 #95849

Merged
merged 2 commits into from Aug 21, 2020
Merged

ocamlPackages.lablgtk3: propagate gtk3 #95849

merged 2 commits into from Aug 21, 2020

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Aug 20, 2020

Motivation for this change
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.

@vbgl
Copy link
Contributor

vbgl commented Aug 20, 2020

In this specific to ocaml-top or does it affect all programs built with lablgtk3?

@marsam
Copy link
Contributor Author

marsam commented Aug 20, 2020

oh, it affects all dependents of lablgtk3. I think we could propagage gtk3 :

--- c/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ i/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -12,8 +12,7 @@ buildDunePackage rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk3 ];
-  propagatedBuildInputs = [ cairo2 ];
+  propagatedBuildInputs = [ gtk3 cairo2 ];
 
   meta = {
     description = "OCaml interface to GTK 3";

@vbgl
Copy link
Contributor

vbgl commented Aug 20, 2020

This makes sense.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Aug 20, 2020
@ofborg ofborg bot requested a review from vbgl August 20, 2020 20:45
@marsam
coq: remove redundant Cocoa dependency
88f8f81 
Cocoa propagated by gtk3
@marsam marsam changed the title ocaml-top: fix build on darwin ocamlPackages.lablgtk3: propagate gtk3 Aug 21, 2020
@marsam
Copy link
Contributor Author

marsam commented Aug 21, 2020

I've updated the PR to propagate gtk3.

Also, I noticed ocamlgraph places its binaries incorrectly, I'm going to fix it in another PR

$ lsd $(nix-build -A ocamlPackages.ocamlgraph)
🗁 l4fpbhclpnh37w96kr2kna631wlw0cyp-ocamlgraph-1.8.8
├── 🗁 lib
│  └── 🗁 ocaml
│     └── 🗁 4.10.0
│        └── 🗁 site-lib
│           └── 🗁 ocamlgraph
│              ├── 🗋 builder.mli
│              ⋮
│              ├── 🗋 xDot.mli
│              └── 🗋 xDotDraw.mli
└── 🗁 nix
   └── 🗁 store
      └── 🗁 l4fpbhclpnh37w96kr2kna631wlw0cyp-ocamlgraph-1.8.8
         └── 🗁 bin
            ├── 🗋 graph-editor
            ├── 🗋 graph-editor.byte
            ├── 🗋 graph-editor.opt
            ├── 🗋 graph-viewer
            ├── 🗋 graph-viewer.byte
            └── 🗋 graph-viewer.opt

@vbgl
Copy link
Contributor

vbgl commented Aug 21, 2020

@GrahamcOfBorg build ocaml-top coq_8_11

@vbgl
Copy link
Contributor

vbgl commented Aug 21, 2020

BTW, I think I have a patch ready somewhere for ocamlgraph…

@vbgl vbgl merged commit f96ec7d into NixOS:master Aug 21, 2020
@vbgl vbgl mentioned this pull request Aug 22, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbgl vbgl Awaiting requested review from vbgl

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@marsam @vbgl