ber_metaocaml: (re)init at 104 #32494
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
vbgl
requested changes
Dec 9, 2017
| url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; | ||
| sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; | ||
| url = "http://okmij.org/ftp/ML/ber-metaocaml-104.tar.gz"; | ||
| sha256 = "1gmwlxairxqcmqa2r6kbf8b4dxc7pfhfbh48g1s14d3z20rj8nib"; | ||
| }; | ||
|
|
||
| # Needed to avoid a SIGBUS on the final executable on mips | ||
| NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; | ||
|
|
||
| patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; |
There was a problem hiding this comment.
This patch does not apply. Is it needed?
| "-x11include" x11inc ]; | ||
|
|
||
| dontStrip = true; | ||
| buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; | ||
| installFlags = "-i"; | ||
| installTargets = "install"; # + optionalString useNativeCompilers " installopt"; | ||
| prePatch = '' | ||
| CAT=$(type -tp cat) |
There was a problem hiding this comment.
Is this CAT variable used anywhere? If not, you may drop the full prePatch attribute.
|
@vbgl as a general point if I have some more time in the future would it be better to modify |
mpickering
force-pushed
the
ber-metaocaml2
branch
from
f8ca8db
to
9a072a4
Compare
|
Thanks for the sharp eye @vbgl , I removed the two redundant parts of the expression. |
vbgl
approved these changes
Dec 9, 2017
|
Thanks. Your suggestion to refactor |
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.
Motivation for this change
The old derivation was broken as the
srcpointed to a mutable url. It was also necessary to make some more packaging changes to get it to compile to follow with changes to the normal ocaml build process.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)