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: c9ff78150b11
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4c9a097cb27
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 15, 2019

  1. strongswan: fix build with enableNetworkManager set to true 

    glib doesn't seem to be propagated, and strongswan with networkmanager
fails to build because of that.
    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    229dc6b View commit details

  2. strongswan: fix build with enableNetworkManager set to true (#71186) 

    strongswan: fix build with enableNetworkManager set to true
    @flokli
    flokli authored Oct 15, 2019
    Copy the full SHA
    d4c9a09 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/networking/strongswan/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/networking/strongswan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, autoreconfHook
, gmp, python, iptables, ldns, unbound, openssl, pcsclite
, gmp, python, iptables, ldns, unbound, openssl, pcsclite, glib
, openresolv
, systemd, pam
, curl
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
++ optionals enableTNC [ trousers sqlite libxml2 ]
++ optionals stdenv.isLinux [ systemd.dev pam iptables ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ])
++ optionals enableNetworkManager [ networkmanager ];
++ optionals enableNetworkManager [ networkmanager glib ];

patches = [
./ext_auth-path.patch