Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d6e86f77e25
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 92343831c80a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 21, 2018

  1. strongswan: ad-hoc fix build 

    Simply add libpcap to buildInputs until iptables with pruned libtool files lands
in master.
    @hedning
    hedning committed Dec 21, 2018
    Copy the full SHA
    ba055b6 View commit details

  2. Merge pull request #52618 from hedning/ad-hoc-fix-strongswan 

    strongswan: ad-hoc fix build
    @Mic92
    Mic92 authored Dec 21, 2018
    Copy the full SHA
    9234383 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/tools/networking/strongswan/default.nix
6 changes: 5 additions & 1 deletion pkgs/tools/networking/strongswan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, curl
, enableTNC ? false, trousers, sqlite, libxml2
, enableNetworkManager ? false, networkmanager
, libpcap
}:

# Note on curl support: If curl is built with gnutls as its backend, the
@@ -30,7 +31,10 @@ stdenv.mkDerivation rec {
[ curl gmp python iptables ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ]
++ optionals stdenv.isLinux [ systemd.dev pam ]
++ optionals enableNetworkManager [ networkmanager ];
++ optionals enableNetworkManager [ networkmanager ]
# ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787
# Remove when the above PR lands in master
++ [ libpcap ];

patches = [
./ext_auth-path.patch