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

newsboat: clean up and fix on Darwin #34120

Merged
merged 1 commit into from Jan 22, 2018
Merged

newsboat: clean up and fix on Darwin #34120

merged 1 commit into from Jan 22, 2018

Conversation

dotlambda
Copy link
Member

Motivation for this change

Build is currently broken on Darwin: https://hydra.nixos.org/build/67522006/nixlog/1
I am not able to test whether this actually fixes it.

Also, I noticed a -DLOCALEDIR=\"/usr/share/locale\" in the output of make.

Finally I followed some suggestions from @nicknovitski's comment:

  • copying contrib/ to $out and
  • adding him as a maintainer.

On a side note, can someone please close #31719?

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.

cc @joachifm

@Mic92
Copy link
Member

Mic92 commented Jan 22, 2018

@GrahamcOfBorg build newsboat

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.

Failure for system: x86_64-darwin

clang++ -std=c++11 -ggdb -Iinclude -Istfl -Ifilter -I. -Irss -Werror -Wall -Wextra -Wunreachable-code -DLOCALEDIR=\"/nix/store/by2nxmg543s81s9ffq55p2zmwf4r3hay-newsboat-2.10.2/share/locale\" -I/nix/store/g7v6lzy4kw1c7xiak8n49xs3y7v67v6n-sqlite-3.21.0-dev/include -I/nix/store/sv4anzzzy208msiz8vqqkaln7khf01jc-curl-7.57.0-dev/include -I/nix/store/hqjk6s39s6vpkfjmmq1spcg67hcvgwm9-libxml2-2.9.7-dev/include/libxml2 -I/include -I/nix/store/wy6ymh7rr9r87qjvxzi3s79gip72s8lk-json-c-0.12.1-dev/include/json-c -D_DARWIN_C_SOURCE -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include/ncursesw -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include -o src/logger.o -c src/logger.cpp
clang++ -std=c++11 -ggdb -Iinclude -Istfl -Ifilter -I. -Irss -Werror -Wall -Wextra -Wunreachable-code -DLOCALEDIR=\"/nix/store/by2nxmg543s81s9ffq55p2zmwf4r3hay-newsboat-2.10.2/share/locale\" -I/nix/store/g7v6lzy4kw1c7xiak8n49xs3y7v67v6n-sqlite-3.21.0-dev/include -I/nix/store/sv4anzzzy208msiz8vqqkaln7khf01jc-curl-7.57.0-dev/include -I/nix/store/hqjk6s39s6vpkfjmmq1spcg67hcvgwm9-libxml2-2.9.7-dev/include/libxml2 -I/include -I/nix/store/wy6ymh7rr9r87qjvxzi3s79gip72s8lk-json-c-0.12.1-dev/include/json-c -D_DARWIN_C_SOURCE -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include/ncursesw -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include -o src/exception.o -c src/exception.cpp
clang++ -std=c++11 -ggdb -Iinclude -Istfl -Ifilter -I. -Irss -Werror -Wall -Wextra -Wunreachable-code -DLOCALEDIR=\"/nix/store/by2nxmg543s81s9ffq55p2zmwf4r3hay-newsboat-2.10.2/share/locale\" -I/nix/store/g7v6lzy4kw1c7xiak8n49xs3y7v67v6n-sqlite-3.21.0-dev/include -I/nix/store/sv4anzzzy208msiz8vqqkaln7khf01jc-curl-7.57.0-dev/include -I/nix/store/hqjk6s39s6vpkfjmmq1spcg67hcvgwm9-libxml2-2.9.7-dev/include/libxml2 -I/include -I/nix/store/wy6ymh7rr9r87qjvxzi3s79gip72s8lk-json-c-0.12.1-dev/include/json-c -D_DARWIN_C_SOURCE -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include/ncursesw -I/nix/store/jp2f4v52cw36xwdjlp8s23i29a3xfbp6-ncurses-6.0-20171125-dev/include -o src/utils.o -c src/utils.cpp
src/utils.cpp:9:10: fatal error: 'iconv.h' file not found
#include <iconv.h>
         ^~~~~~~~~
1 error generated.
make: *** [Makefile:113: src/utils.o] Error 1
builder for '/nix/store/mal2pxvvmz58dfv58kyfm43v4i8lqinq-newsboat-2.10.2.drv' failed with exit code 2
error: build of '/nix/store/mal2pxvvmz58dfv58kyfm43v4i8lqinq-newsboat-2.10.2.drv' failed

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

strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/bin 
patching script interpreter paths in /nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/contrib/getpocket.com/send-to-pocket.sh: interpreter directive changed from "/bin/bash" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/bash"
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/contrib/getpocket.com/create-pocket-user-token.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/contrib/bookmark-scuttle.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/contrib/bookmark-pinboard.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2/contrib/bookmark-delicious.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-newsboat-2.10.2.drv-0 in /nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2...
/nix/store/4n625czqgrdws1db41wj5s7f5pykg27c-newsboat-2.10.2

@dotlambda
Copy link
Member Author

dotlambda commented Jan 22, 2018

@Mic92 Could you please trigger another build?

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: aarch64-linux

strip is /nix/store/jwz859pxqj7sl2dbwvmxkx68jp774izb-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/bin
patching script interpreter paths in /nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/contrib/bookmark-delicious.sh: interpreter directive changed from "/bin/sh" to "/nix/store/rc78viijga8i0m4imrnqk8d1csyqr8yx-bash-4.4-p12/bin/sh"
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/contrib/bookmark-pinboard.sh: interpreter directive changed from "/bin/sh" to "/nix/store/rc78viijga8i0m4imrnqk8d1csyqr8yx-bash-4.4-p12/bin/sh"
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/contrib/bookmark-scuttle.sh: interpreter directive changed from "/bin/sh" to "/nix/store/rc78viijga8i0m4imrnqk8d1csyqr8yx-bash-4.4-p12/bin/sh"
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/contrib/getpocket.com/create-pocket-user-token.sh: interpreter directive changed from "/bin/sh" to "/nix/store/rc78viijga8i0m4imrnqk8d1csyqr8yx-bash-4.4-p12/bin/sh"
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2/contrib/getpocket.com/send-to-pocket.sh: interpreter directive changed from "/bin/bash" to "/nix/store/rc78viijga8i0m4imrnqk8d1csyqr8yx-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2...
/nix/store/fydv8f6gjhcdw9q7c25vca0ifydpa1xl-newsboat-2.10.2

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Jan 22, 2018
@LnL7
Copy link
Member

LnL7 commented Jan 22, 2018

@GrahamcOfBorg build newsboat

1 similar comment
@Mic92
Copy link
Member

Mic92 commented Jan 22, 2018

@GrahamcOfBorg build newsboat

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: aarch64-linux

/nix/store/nzxd8yyw5ggrrfmwy6bldgxqkgzgij0l-newsboat-2.10.2

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

strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/bin 
patching script interpreter paths in /nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/contrib/getpocket.com/create-pocket-user-token.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/contrib/getpocket.com/send-to-pocket.sh: interpreter directive changed from "/bin/bash" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/bash"
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/contrib/bookmark-delicious.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/contrib/bookmark-scuttle.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2/contrib/bookmark-pinboard.sh: interpreter directive changed from "/bin/sh" to "/nix/store/i0ay05pqkbnvpfijm52mmlrp6kmkl80c-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-newsboat-2.10.2.drv-0 in /nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2...
/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2

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

/nix/store/784ldpngll0nrqb7lzazg315vav97854-newsboat-2.10.2

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

gzipping man pages under /nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/share/man/
strip is /nix/store/i1zz228nl3bljcbb83fq0rq7lr7nvv4y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/bin
patching script interpreter paths in /nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/contrib/bookmark-delicious.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/contrib/bookmark-pinboard.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/contrib/bookmark-scuttle.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/contrib/getpocket.com/create-pocket-user-token.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2/contrib/getpocket.com/send-to-pocket.sh: interpreter directive changed from "/bin/bash" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/bash"
/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2

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

/nix/store/w4xqfxn5cn6xbg79wrp6kn69i73c1yf0-newsboat-2.10.2

@dotlambda
Copy link
Member Author

I believe this can be merged.

'';

nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt libiconv ]
Copy link
Member

Choose a reason for hiding this comment

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

This is only a dependency on darwin and should be move in the optional block a line below.

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, iconv.h is referenced in utils.cpp so it is a dependency on both, Darwin and Linux.
But maybe it's in one of the dependenies' propagatedBuildInputs for Linux only.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh I see, libiconv is not needed on Linux because it is part of the standard library. Fixing it :)

@Mic92 Mic92 merged commit 21a69a9 into NixOS:master Jan 22, 2018
@dotlambda dotlambda deleted the newsboat branch February 8, 2018 11:00
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

4 participants