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

plasma-nm: Fix cipher discovery by setting path to openvpn #24816

Merged
merged 2 commits into from Apr 13, 2017

Conversation

benley
Copy link
Member

@benley benley commented Apr 11, 2017

Motivation for this change

As seen in #24808 , it's not possible to configure the cipher field without this patch. I also toggled enableParallelBuild because this package takes surprisingly long to compile.

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
    • 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.

@mention-bot
Copy link

@benley, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel to be a potential reviewer.

(substituteAll {
src = ./0002-openvpn-binary-path.patch;
inherit openvpn;
})
Copy link
Member

@Mic92 Mic92 Apr 11, 2017

Choose a reason for hiding this comment

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

I would prefer makeWrapper to extend PATH if possible, so we do not have to maintain this patch in future updates.

Copy link
Member Author

Choose a reason for hiding this comment

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

That does sound sensible; I only went with a patch following the existing example. I'll switch to a wrapper.

Copy link
Member

Choose a reason for hiding this comment

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

Adding openvpn to propagatedBuildInputs might also work

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure that makeWrapper will do the job here. plasma-nm provides several plugins (plasmoids) and there is no guarantee which executable will load each.

Adding it to propagatedBuildInputs will not work.

I would prefer the path be patched into the source code as with other executables.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK - which one is it going to be? The only approach that I know will reliably work is patching the source. If updating the patch becomes irritating over time, maybe we can find a way to do it with sed or something instead of a patch?

Copy link
Member

Choose a reason for hiding this comment

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

I'm merging it as is.

The irritation of updating the patches is a red herring; I've been maintaining these packages for years and I can count the number of patches I have updated on one hand.

@ttuegel ttuegel merged commit c9ba391 into NixOS:master Apr 13, 2017
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

4 participants