diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-11-03 20:41:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-22 21:17:27 +0000 |
| commit | 5e85e6a3efa009ad0efd6bb88da20f357b2058b3 (patch) | |
| tree | bb20aba87ba7f43065d1c09b0d7c33114e383a35 | |
| parent | 2d8ed26b2a47b89e077897430755c99450439741 (diff) | |
| download | nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar.gz nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar.bz2 nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar.lz nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar.xz nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.tar.zst nixpkgs-5e85e6a3efa009ad0efd6bb88da20f357b2058b3.zip | |
vpnc: fix cross
| -rw-r--r-- | pkgs/tools/networking/vpnc/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 2ae78d68c42..9e8f27b62bc 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages , makeWrapper, pkg-config, perl , gawk, gnutls, libgcrypt, openresolv, vpnc-scripts , opensslSupport ? false, openssl # Distributing this is a GPL violation. @@ -17,6 +17,11 @@ stdenv.mkDerivation { }; patches = [ + # Use pkg-config to find libgcrypt, fixing cross. + (fetchpatch { + url = "https://github.com/streambinder/vpnc/commit/f1efcfc9824944370de2fc4ac46dc4292ddbecea.patch"; + sha256 = "13kxp2147q4jz98p5qqmj32mg15lb02jdz5j4lfjgvlmbz133q4h"; + }) # Don't do networking during build. (fetchpatch { url = "https://github.com/streambinder/vpnc/commit/9f4e3ab1f51c8c5ff27b8290f5a533a87d85c011.patch"; @@ -24,7 +29,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ makeWrapper ] + nativeBuildInputs = [ makeWrapper perl ] ++ lib.optional (!opensslSupport) pkg-config; buildInputs = [ libgcrypt perl ] ++ (if opensslSupport then [ openssl ] else [ gnutls ]); @@ -33,6 +38,8 @@ stdenv.mkDerivation { "PREFIX=$(out)" "ETCDIR=$(out)/etc/vpnc" "SCRIPT_PATH=${vpnc-scripts}/bin/vpnc-script" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "VPNC=${buildPackages.vpnc}/bin/vpnc" ] ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes"; postPatch = '' |