From 4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 24 Sep 2012 23:49:11 +0400
Subject: [PATCH] Opportunistic measures to prevent the need to convert null to
 string; they may work or may not work for actually building

---
 .../instant-messengers/baresip/default.nix      |   7 ++++---
 pkgs/development/libraries/libre/default.nix    |   7 ++++---
 .../libraries/librem/.default.nix.swp           | Bin 12288 -> 0 bytes
 pkgs/development/libraries/librem/default.nix   |   7 ++++---
 4 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 pkgs/development/libraries/librem/.default.nix.swp

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 00b82d555fe..ba530374c71 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";
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 208744fcdde..cc9139d664e 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
   buildInputs = [zlib openssl];
   makeFlags = [
     "USE_ZLIB=1" "USE_OPENSSL=1" 
-    "SYSROOT=${stdenv.gcc.libc}"
-    "SYSROOT_ALT=${stdenv.gcc.gcc}"
     ''PREFIX=$(out)''
-  ];
+  ]
+  ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"
+  ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"
+  ;
   meta = {
     homepage = "http://www.creytiv.com/re.html";
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/development/libraries/librem/.default.nix.swp b/pkgs/development/libraries/librem/.default.nix.swp
deleted file mode 100644
index ad2094919ae23d9f8d275fbfce49973ae0c2ccc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmYc?2=nw+FxN9?U|?VnU|@I@lMv8zK#L($nt`Dxu{b+34<vyfn-~}-8YHC|;#bAM
zpr4VSo2p-wT999?pO;xtkeyzv4<=Gl%Tjal3vyHQO7wFwlZq0HGE<AetW^D!)U?FX
zoD#jf%nCy0kIIjRz-S2I3jtmRV<STYkP2lbMFnA@P!MwzkA}c#2#kinXb6mkz-S1J
zhQMeDjE2By2#k;rC@ElMsAphcV1oKr3`#Si(NOLvH5vk=Aut*OqaiRF0;3@?8Umvs
zFd71*Aut*OqaiRF0;3@?1VbP(g@NHa4+BFsFJ%57*8jiD&%kh)pMhZ=KLf)=eg=jH
zeg+0-eg=krd<+af`4|{(@-Z-+<YQo1&d0#e#>c>r#K*wk!^gnj&d0!D!^gnD4N}9)
zz_5UqfuV?(fgzU{YR3=^qfsZ1hQMeDjE2By2#kinXb6mkz-S1JhQMeDjD`S-AyCVp
zpipbgprD|jkdv95npd2vV5?A`S(2epT#}NSSEiSfnWP7mDYjNfDo!zmsLoBy%qvOE
z%u6jQ#-amB)><JNvSvFLqOl++u_P_OC>NVHxSX{@PG(+d1w;pEg?2$=I>=>886_nJ
zR{Hwo<>h+GMX8k~nPqy(`MLT<sd^bDxj9N84Y{c$i3+v~)eH&>P%G8d1A<)LJR@vX
zH1bPJG}YC?{#6Q&3=Z=54~cj539(hFhWa->Iax0~Ik{E|MGdNaPG%BZL1?gRe3Xx;
zldYkWf)a@1AK>a29P9()GbkwJCT6F)<s_zqd>hT6ppaCWnUms~S5R647OBd~Oj5`%
zNX;uQ&H+0X8W+VGiAJVo3bqPLhRK$emFdMMW`!9kCW!`#MJW{-DV14?<)#G|$vGKS
zxy88_S(Pb;6?wTyiP`0qriK=|;9yWtC@snXnSdk63QCjoi&Aw}s>@P~iZk=`YV}GI
zi}cc~z?zGTl5NvcOOi7{W`II6FEJM!{-Blc$eO^ap(cPVGte{9Gg7i<fQDvnwo7VJ
jW?5oMW`3SRQEIY6H3KxDbrfLc>nMOiK?fELwN?xO6(I>!

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index e6b22d1ab4d..04f3cc97bf3 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -10,10 +10,11 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
-    "SYSROOT=${stdenv.gcc.libc}"
-    "SYSROOT_ALT=${stdenv.gcc.gcc}"
     ''PREFIX=$(out)''
-  ];
+  ]
+  ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"
+  ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"
+  ;
   meta = {
     homepage = "http://www.creytiv.com/rem.html";
     platforms = with stdenv.lib.platforms; linux;