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

add libcurl to radarr + sonarr wrappers #27628

Merged

Conversation

georgewhewell
Copy link
Contributor

Motivation for this change

Mono 4 doesn't support TLS 1.2, so breaks on many https:// urls. Adding libcurl lets sonarr/radarr fallback work.

Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {

makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
--add-flags "$out/share/${name}/Radarr.exe" \
--prefix LD_LIBRARY_PATH ':' "${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.

Not a blocker, but you could take the opportunity to combine these into a single makeLibraryPath [ curl sqlite ... ] here. Briefer and obviates the need to worry about output selection.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks- didn't know about makeLibraryPath, have updated.

@georgewhewell georgewhewell force-pushed the add-libcurl-to-sonarr-radarr-wrapper branch from db6a339 to f993db0 Compare July 25, 2017 10:57
@georgewhewell georgewhewell force-pushed the add-libcurl-to-sonarr-radarr-wrapper branch from f993db0 to a3369f3 Compare July 25, 2017 11:03
@joachifm
Copy link
Contributor

cc @edwtjo

@joachifm joachifm merged commit 4ed291b into NixOS:master Jul 31, 2017
@joachifm
Copy link
Contributor

Thank you.

@georgewhewell georgewhewell deleted the add-libcurl-to-sonarr-radarr-wrapper branch July 31, 2017 15:16
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.

None yet

3 participants