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

libcdio-paranoia: fix darwin build #37735

Merged
merged 1 commit into from
Mar 24, 2018

Conversation

knedlsepp
Copy link
Member

Motivation for this change

18.03 ZHF darwin edition: #36454 (Please backport to 18.03!)
I also ran result/bin/cd-paranoia -A with a CD inserted, and it worked fine.
I put DiskArbitration in the propagatedBuildInputs to fix the cmus build. Now cmus should also build fine. I haven't however figured out how to play a CD using cmus.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 24, 2018
@Mic92
Copy link
Member

Mic92 commented Mar 24, 2018

@GrahamcOfBorg build cmus

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cmus

Partial log (click to expand)

copying path '/nix/store/wda7ym302s9wdzvl5bl6r8af651sjxhx-soxr-0.1.2' from 'https://cache.nixos.org'...
copying path '/nix/store/019wv6cxx7q78hzw1lhvfwrvii8ilwcl-x264-20170731-2245-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/lgy5sr4adld8h1qdl70aaszir52xjr30-x265-2.6' from 'https://cache.nixos.org'...
copying path '/nix/store/dxshlf82qrfmcxwplny79kmdi0c2wk64-xvidcore-1.3.5' from 'https://cache.nixos.org'...
copying path '/nix/store/0amfanspbq8knx2x05nvylh7nkg25vpd-opusfile-0.10' from 'https://cache.nixos.org'...
copying path '/nix/store/d19di1kxlvj4rvjw11fqb62f9qsss6y9-libcdio-2.0.0' from 'https://cache.nixos.org'...
copying path '/nix/store/3vaa23i39mys955cn5lgbx7954842i19-libcdio-paranoia-0.94+2' from 'https://cache.nixos.org'...
copying path '/nix/store/8vc2rp0icmcx0zk48ximvbmbcdrrh4c6-ffmpeg-2.8.13' from 'https://cache.nixos.org'...
copying path '/nix/store/bm8bpwiwk9l3qnrc40lszfw21vis83vv-cmus-2.7.1' from 'https://cache.nixos.org'...
/nix/store/bm8bpwiwk9l3qnrc40lszfw21vis83vv-cmus-2.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cmus

Partial log (click to expand)

:--:--
--:--:-
-
0

 16  210k   16 34445    0     0  34445      0  0:0
0:06 --:--:--  0:00:06 53155

100  210k  100  210k    0     0   210k      0  0:00:01 --:--:--  0:00:01
 218k

/nix/store/bv99ibcmq2m8vavp26y6wvnzfha4bknq-cmus-2.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: cmus

Partial log (click to expand)

INSTALL /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/share/man/man1/cmus-remote.1
INSTALL /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/share/man/man7/cmus-tutorial.7
INSTALL /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/share/doc/cmus/examples/cmus-status-display
post-installation fixup
gzipping man pages under /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/share/man/
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/lib  /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/bin
patching script interpreter paths in /nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1
/nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1/share/doc/cmus/examples/cmus-status-display: interpreter directive changed from "/bin/sh" to "/nix/store/8hdxjv3m14jgdnawi5l0mz2h59qkk2g9-bash-4.4-p19/bin/sh"
/nix/store/r3vajz2lg0a9rv5sn3afiw809b64jas6-cmus-2.7.1

@Mic92 Mic92 merged commit 394a709 into NixOS:master Mar 24, 2018
@Mic92
Copy link
Member

Mic92 commented Mar 24, 2018

backport to 18.30: a978eee

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants