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

Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building

Browse Source
This commit is contained in:
Michael Raskin 2012-09-24 23:49:11 +04:00
parent 732811700a
commit 4517d03af1
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/instant-messengers/baresip/default.nix
View File

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
"LIBRE_INC=${libre}/include/re" "LIBRE_INC=${libre}/include/re"
"LIBRE_SO=${libre}/lib" "LIBRE_SO=${libre}/lib"
"LIBREM_PATH=${librem}" "LIBREM_PATH=${librem}"
"SYSROOT=${stdenv.gcc.libc}"
"SYSROOT_ALT=${stdenv.gcc.gcc}"
''PREFIX=$(out)'' ''PREFIX=$(out)''
"USE_VIDEO=1" "USE_VIDEO=1"
@ -33,7 +31,10 @@ stdenv.mkDerivation rec {
"USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1="
"USE_ILBC=" "USE_OPUS=" "USE_SILK=" "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 ''; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm '';
meta = { meta = {
homepage = "http://www.creytiv.com/baresip.html"; homepage = "http://www.creytiv.com/baresip.html";

7
pkgs/development/libraries/libre/default.nix
View File

@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
buildInputs = [zlib openssl]; buildInputs = [zlib openssl];
makeFlags = [ makeFlags = [
"USE_ZLIB=1" "USE_OPENSSL=1" "USE_ZLIB=1" "USE_OPENSSL=1"
"SYSROOT=${stdenv.gcc.libc}"
"SYSROOT_ALT=${stdenv.gcc.gcc}"
''PREFIX=$(out)'' ''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 = { meta = {
homepage = "http://www.creytiv.com/re.html"; homepage = "http://www.creytiv.com/re.html";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;

BIN
pkgs/development/libraries/librem/.default.nix.swp
View File

Binary file not shown.

7
pkgs/development/libraries/librem/default.nix
View File

@ -10,10 +10,11 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_MK=${libre}/share/re/re.mk"
"LIBRE_INC=${libre}/include/re" "LIBRE_INC=${libre}/include/re"
"SYSROOT=${stdenv.gcc.libc}"
"SYSROOT_ALT=${stdenv.gcc.gcc}"
''PREFIX=$(out)'' ''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 = { meta = {
homepage = "http://www.creytiv.com/rem.html"; homepage = "http://www.creytiv.com/rem.html";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;