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

screenfetch: fix darwin execution #31814

Merged
merged 1 commit into from Nov 20, 2017
Merged

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Nov 19, 2017

Fixes #31790

Things done
  • 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/)
  • Fits CONTRIBUTING.md.

coreutils gawk procps gnused findutils xdpyinfo
xprop gnugrep ncurses bc
]}
--set PATH ${lib.makeBinPath ([
Copy link
Member

Choose a reason for hiding this comment

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

Using --suffix will prefix PATH instead of overriding it, then the wrapper won't need things like coreutils that are always available.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep that would work although prefix might be better. Eventual goal is to get rid of all /usr/bin stuff and make it all "pure" NixOS (although now I've realized that system_profiler and defaults for instance are not even available in opensource.apple.com)

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually I think I'll leave it as is. That way we don't have to have a separate installPhase for linux vs darwin.

Copy link
Member

Choose a reason for hiding this comment

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

That's fine.

@LnL7
Copy link
Member

LnL7 commented Nov 19, 2017

@GrahamcOfBorg build screenfetch

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

building
no Makefile, doing nothing
installing
patching script interpreter paths in /nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11/bin/screenfetch
/nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11/bin/screenfetch: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
post-installation fixup
gzipping man pages under /nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11/share/man/
stripping (with flags -S) in /nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11/bin
patching script interpreter paths in /nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11
/nix/store/d6yavygnkjpbpdmz0yawa73qp7xi18v2-screenFetch-2016-10-11

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

installing
patching script interpreter paths in /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11/bin/screenfetch
/nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11/bin/screenfetch: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11
gzipping man pages under /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11/share/man/
stripping (with flags -S) in /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11/bin 
patching script interpreter paths in /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11
checking for references to /tmp/nix-build-screenFetch-2016-10-11.drv-0 in /nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11...
/nix/store/h4z9yanyqzsvfg4ax2iyzhm3lyzn0x2s-screenFetch-2016-10-11

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Nov 20, 2017
@LnL7 LnL7 merged commit d5b0227 into NixOS:master Nov 20, 2017
@matthewbauer matthewbauer deleted the screenfetch-darwin branch February 22, 2019 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants