js_of_ocaml: fix jbuild (explicitly call bash) #29749
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
orivej
reviewed
Sep 24, 2017
| @@ -11,5 +11,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; | |||
|
|
|||
| patches = [ ./jbuild.diff ]; | |||
There was a problem hiding this comment.
This is usually done with patchShebangs in the postPatch phase.
There was a problem hiding this comment.
Thank you. That works an is indeed much simpler: master...ibor:master
Do you need a new pull request?
There was a problem hiding this comment.
This pull request is fine (although its individual commits could be squashed together for the better), but I don't have the permission to merge yet. (I hope to get it soon.)
|
In general, please squash the commits. Thank you for your contribution! |
vbgl
referenced
this pull request
Sep 25, 2017
js_of_ocaml-camlp4: init at 3.0.0 js_of_ocaml-ppx: init at 3.0.0
globin
pushed a commit
that referenced
this pull request
Sep 25, 2017
* js_of_ocaml: fix jbuild (explicitly call bash) * js_of_ocaml: Use patchShebangs instead of manual patch (cherry picked from commit 00422b2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ocamlPackages.js_of_ocaml-3.0.0 currently fails to build because bash is not called properly.
The patch fixes jbuild to explicitly call generate_stubs.sh via bash.
BTW: Modifying generate_stubs.sh's shebang (#!/bin/bash -> #!/usr/bin/env bash ) did not help.