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

dvtm: refactor (fix on darwin) #47103

Merged
merged 2 commits into from Sep 22, 2018
Merged

dvtm: refactor (fix on darwin) #47103

merged 2 commits into from Sep 22, 2018

Conversation

luke-clifton
Copy link
Contributor

Motivation for this change

This PR adds the required CFLAGS to get dvtm to build in darwin. It also applies a patch which has been sitting idle upstream for a while. This patch is required for dvtm to work on newer versions of macOS.

See martanne/dvtm#69

The patch works fine on Linux as well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Sep 21, 2018
@luke-clifton
Copy link
Contributor Author

@vrthra are you able to review this?

@luke-clifton
dvtm: refactor
32b467b 
Add platforms list.
@joachifm
Copy link
Contributor

@GrahamcOfBorg build dtvm

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dtvm

Partial log (click to expand)

Cannot nix-instantiate `dtvm' because:
error: attribute 'dtvm' in selection path 'dtvm' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: dtvm

Partial log (click to expand)

Cannot nix-instantiate `dtvm' because:
error: attribute 'dtvm' in selection path 'dtvm' not found

@joachifm
Copy link
Contributor

@GrahamcOfBorg build dvtm

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dvtm

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15
shrinking /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15/bin/dvtm
gzipping man pages under /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15/bin
patching script interpreter paths in /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15
/nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15/bin/dvtm-status: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15...
/nix/store/qacw895pbn6wl850r0czcsdjxps8ylik-dvtm-0.15

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: dvtm

Partial log (click to expand)

installing manual page to /nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15/share/man/man1
installing terminfo description
2 entries written to /nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15/share/terminfo
post-installation fixup
gzipping man pages under /nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15/share/man/
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15/bin
patching script interpreter paths in /nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15
/nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15/bin/dvtm-status: interpreter directive changed from "/bin/sh" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/sh"
/nix/store/pmscfp4vvlh9za7n26ifvx9f1vh7apr4-dvtm-0.15

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dtvm

Partial log (click to expand)

Cannot nix-instantiate `dtvm' because:
error: attribute 'dtvm' in selection path 'dtvm' not found

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dvtm

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15
shrinking /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15/bin/dvtm
gzipping man pages under /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15/bin
patching script interpreter paths in /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15
/nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15/bin/dvtm-status: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15...
/nix/store/hs218pxc6npnff31b6plwb69c5ha62py-dvtm-0.15

@joachifm joachifm merged commit 4eebe20 into NixOS:master Sep 22, 2018
@joachifm
Copy link
Contributor

Thank you

LnL7 pushed a commit that referenced this pull request Sep 25, 2018
@luke-clifton @LnL7
dvtm: refactor (fix on darwin) (#47103)
b018ccc 
(cherry picked from commit 4eebe20)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@luke-clifton @joachifm @GrahamcOfBorg @LnL7