diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-09-24 23:49:11 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-09-24 23:49:11 +0400 |
| commit | 4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8 (patch) | |
| tree | 93e15abb8eb8a01566118a48843dbdd3214e3746 /pkgs/applications/networking/instant-messengers/baresip | |
| parent | 732811700a849e53b4411ec9395b12c3ce5277db (diff) | |
Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/baresip')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/baresip/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 00b82d555fe73..ba530374c71f8 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" - "SYSROOT=${stdenv.gcc.libc}" - "SYSROOT_ALT=${stdenv.gcc.gcc}" ''PREFIX=$(out)'' "USE_VIDEO=1" @@ -33,7 +31,10 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" - ]; + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; |