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

ckan: Add curl to runtime libraries #15278

Merged
merged 1 commit into from
May 7, 2016
Merged

ckan: Add curl to runtime libraries #15278

merged 1 commit into from
May 7, 2016

Conversation

Baughn
Copy link
Contributor

@Baughn Baughn commented May 6, 2016

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
    • OS X
    • Linux
  • 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.

CKAN uses libcurl for some, but not all, downloads. We'd better include it.

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
install -m 0644 $exe $out/bin
makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \
--add-flags $out/bin/$exe \
--set LD_LIBRARY_PATH ${gtk.out}/lib
--set LD_LIBRARY_PATH ${gtk.out}/lib:${curl.out}/lib
Copy link
Contributor

Choose a reason for hiding this comment

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

This may be more convenient as stdenv.lib.makeLibraryPath [ gtk curl ], or does that not work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't know about it. Is there a list of these convenience functions somewhere?

Copy link
Contributor

Choose a reason for hiding this comment

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

There probably should be, but I usually just root around in lib/

@joachifm
Copy link
Contributor

joachifm commented May 7, 2016

Thank you

@joachifm joachifm merged commit 1651086 into NixOS:master May 7, 2016
@joachifm
Copy link
Contributor

joachifm commented May 7, 2016

@Baughn Baughn deleted the ckan branch May 7, 2016 16:52
@Baughn
Copy link
Contributor Author

Baughn commented May 7, 2016

Hmm. Not really sure what could be causing that.

@joachifm
Copy link
Contributor

joachifm commented May 7, 2016

Doesn't look related to this PR in particular, but mono is a complete unknown to me. It used to build, though (https://hydra.nixos.org/build/35332739)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants