JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dropbear: fix static build

Browse Source 
Fixes #24839. Also change default sftp-server path to a more canonical.
This commit is contained in:
Nikolay Amiantov 2017-04-14 13:59:28 +03:00
parent c2da0fb22c
commit 3507da085f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/dropbear/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, zlib, enableStatic ? false, { stdenv, lib, fetchurl, glibc, zlib
sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: , enableStatic ? false
, sftpPath ? "/run/current-system/sw/libexec/sftp-server"
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dropbear-2016.74"; name = "dropbear-2016.74";
@ -11,7 +13,7 @@ stdenv.mkDerivation rec {
dontDisableStatic = enableStatic; dontDisableStatic = enableStatic;
configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; configureFlags = lib.optional enableStatic "LDFLAGS=-static";
CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
./pass-path.patch ./pass-path.patch
]; ];
buildInputs = [ zlib ]; buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html";