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

sqsh: Fix darwin build #39883

Merged
merged 1 commit into from May 2, 2018
Merged

sqsh: Fix darwin build #39883

merged 1 commit into from May 2, 2018

Conversation

knedlsepp
Copy link
Member

Motivation for this change

This fixes the darwin build.

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.

matthewbauer
matthewbauer reviewed May 2, 2018
View reviewed changes
pkgs/development/tools/sqsh/default.nix Outdated
'';

enableParallelBuilding = true;

buildInputs = [ freetds readline ];
buildInputs = [ freetds readline ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
Copy link
Member

Choose a reason for hiding this comment

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

We don't want to use conditionals here. It will be null on Glibc systems anyway.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@globin
Copy link
Member

globin commented May 2, 2018

@GrahamcOfBorg build sqsh

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sqsh

Partial log (click to expand)

make[1]: 'sqsh' is up to date.
make[1]: Leaving directory '/build/sqsh-2.5/src'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1
shrinking /nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1/bin/sqsh
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1/bin
patching script interpreter paths in /nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1
checking for references to /build in /nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1...
/nix/store/ywglcq7l7cd99yzlgky64mxj8kw39ngi-sqsh-2.5.16.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: sqsh

Partial log (click to expand)

r - tsql.yy.o
make[1]: Leaving directory '/private/tmp/nix-build-sqsh-2.5.16.1.drv-0/sqsh-2.5/src/sqsh_parser'
make[1]: Entering directory '/private/tmp/nix-build-sqsh-2.5.16.1.drv-0/sqsh-2.5/src'
make[1]: 'sqsh' is up to date.
make[1]: Leaving directory '/private/tmp/nix-build-sqsh-2.5.16.1.drv-0/sqsh-2.5/src'
post-installation fixup
strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/dsadcl0nz9f62vdpisjkmsbmzr697841-sqsh-2.5.16.1/bin
patching script interpreter paths in /nix/store/dsadcl0nz9f62vdpisjkmsbmzr697841-sqsh-2.5.16.1
/nix/store/dsadcl0nz9f62vdpisjkmsbmzr697841-sqsh-2.5.16.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sqsh

Partial log (click to expand)

make[1]: 'sqsh' is up to date.
make[1]: Leaving directory '/build/sqsh-2.5/src'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1
shrinking /nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1/bin/sqsh
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1/bin
patching script interpreter paths in /nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1
checking for references to /build in /nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1...
/nix/store/8339m1sr88dzp16srb76w5d4amrz9agj-sqsh-2.5.16.1

@globin globin merged commit 8936f8f into NixOS:master May 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 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
@knedlsepp @globin @GrahamcOfBorg @matthewbauer