diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
| commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
| tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/tools/networking/badvpn | |
| parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) | |
| download | nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.gz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.bz2 nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.lz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.xz nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.tar.zst nixpkgs-b04fc593e7b55fe1f74421b11589f12a339c92e2.zip | |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/tools/networking/badvpn')
| -rw-r--r-- | pkgs/tools/networking/badvpn/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index c9ebc12b0db..ab898a86936 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkgconfig, nspr, bash, debug ? false}: +{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -10,15 +10,15 @@ let sha256="02b1fra43l75mljkhrq45vcrrqv0znicjn15g7nbqx3jppzbpm5z"; }; - buildInputs = [ - cmake openssl nss nspr - ]; + compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ pkgconfig ]; - inherit buildInputs; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + openssl nss nspr + ]; src = fetchurl { inherit (s) url sha256; }; |