diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-04-14 13:59:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-04-16 12:58:27 +0300 |
| commit | 3507da085f6373302385c0c44f7370d095ab5d83 (patch) | |
| tree | 96d93a7e6c4272c9b78ce8bd02baa012c02252c4 /pkgs/tools/networking | |
| parent | c2da0fb22c1ccea46995854311fa02eaa9ce8916 (diff) | |
| download | nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar.gz nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar.bz2 nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar.lz nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar.xz nixlib-3507da085f6373302385c0c44f7370d095ab5d83.tar.zst nixlib-3507da085f6373302385c0c44f7370d095ab5d83.zip | |
dropbear: fix static build
Fixes #24839. Also change default sftp-server path to a more canonical.
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/dropbear/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b1f726ad27d6..aeace91df191 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, zlib, enableStatic ? false, -sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: +{ stdenv, lib, fetchurl, glibc, zlib +, enableStatic ? false +, sftpPath ? "/run/current-system/sw/libexec/sftp-server" +}: stdenv.mkDerivation rec { name = "dropbear-2016.74"; @@ -11,7 +13,7 @@ stdenv.mkDerivation rec { dontDisableStatic = enableStatic; - configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; + configureFlags = lib.optional enableStatic "LDFLAGS=-static"; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { ./pass-path.patch ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; |