diff options
Diffstat (limited to 'pkgs/development')
22 files changed, 63 insertions, 63 deletions
diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix index 571cd2be623..d4df64e79c0 100644 --- a/pkgs/development/androidenv/build-app.nix +++ b/pkgs/development/androidenv/build-app.nix @@ -6,7 +6,7 @@ assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - platformName = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then "linux" + platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx" else throw "Platform: ${stdenv.system} is not supported!"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4b9fd616d84..04e9f25fedf 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -47,9 +47,9 @@ let " --enable-threads=posix" + " --enable-nls" ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in stdenv.mkDerivation ({ @@ -85,7 +85,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler crossStageStatic binutilsCross libcCross; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildInputs = [texinfo gmp mpfr] ++ (optionals langTreelang [bison flex]) diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 49fbcd3205a..09609894ac6 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -84,9 +84,9 @@ let version = "4.4.6"; " --enable-nls" + " --disable-decimal-float" # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in @@ -163,11 +163,11 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; # Needed for the cross compilation to work AR = "ar"; @@ -211,7 +211,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} "; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b0916cf52b8..cb0432b6672 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -78,7 +78,7 @@ let version = "4.5.4"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -115,9 +115,9 @@ let version = "4.5.4"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in @@ -189,7 +189,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -237,7 +237,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -255,11 +255,11 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; crossAttrs = { AR = "${stdenv.cross.config}-ar"; @@ -299,7 +299,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d67ee8bef0e..38c3282b7c4 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -101,7 +101,7 @@ let version = "4.6.3"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -149,9 +149,9 @@ let version = "4.6.3"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -275,7 +275,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -294,12 +294,12 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -350,7 +350,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 3e45efcf645..05e7568a803 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -99,7 +99,7 @@ let version = "4.7.2"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -147,9 +147,9 @@ let version = "4.7.2"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; @@ -211,7 +211,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -274,7 +274,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -296,12 +296,12 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -351,7 +351,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 79208743ae4..1de0c88a6bc 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "gentoo-gnatboot-4.1"; - src = if (stdenv.system == "i686-linux") then + src = if stdenv.system == "i686-linux" then fetchurl { url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2"; sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; } - else if (stdenv.system == "x86_64-linux") then + else if stdenv.system == "x86_64-linux" then fetchurl { url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2"; sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 60ea7981931..955daa0ad9f 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -54,9 +54,9 @@ stdenv.mkDerivation { patches = [ ./cacert.patch ]; GOOS = "linux"; - GOARCH = if (stdenv.system == "i686-linux") then "386" - else if (stdenv.system == "x86_64-linux") then "amd64" - else if (stdenv.system == "armv5tel-linux") then "arm" + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { for a in go gofmt godoc; do wrapProgram "$out/bin/$a" \ --set "GOROOT" $out/share/go \ - ${if (stdenv.system == "armv5tel-linux") then "--set GOARM $GOARM" else ""} + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} done # Copy the emacs configuration for Go files. diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f414dd71965..f44efb94358 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ license = "GPL-3"; }; } // ( - if (config.octave.devVersion or false) then { + if config.octave.devVersion or false then { name = "octave-hg"; # developement version mercurial repo # REGION AUTO UPDATE: { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; } src = sourceFromHead "octave-03b414516dd8.tar.gz" diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index 90b57d6af0c..e0235cd8b39 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -29,7 +29,7 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; + cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; in diff --git a/pkgs/development/libraries/boost/1.46.nix b/pkgs/development/libraries/boost/1.46.nix index 430189ad32b..54a9d8d6c56 100644 --- a/pkgs/development/libraries/boost/1.46.nix +++ b/pkgs/development/libraries/boost/1.46.nix @@ -28,7 +28,7 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; + cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; in diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix index 7a2486883f9..c63ee94fa9b 100644 --- a/pkgs/development/libraries/boost/1.47.nix +++ b/pkgs/development/libraries/boost/1.47.nix @@ -29,11 +29,11 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index ddda72468ab..dfad38b30a5 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -29,11 +29,11 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix index 32be8fca191..d5e5c5f931d 100644 --- a/pkgs/development/libraries/boost/1.51.nix +++ b/pkgs/development/libraries/boost/1.51.nix @@ -27,11 +27,11 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix index 0f8a40888a4..352a2d4aac9 100644 --- a/pkgs/development/libraries/boost/1.52.nix +++ b/pkgs/development/libraries/boost/1.52.nix @@ -27,11 +27,11 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index f73480b3ce4..d85a24fa63a 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { name = "fmod-42204"; - src = if (stdenv.system == "i686-linux") then + src = if stdenv.system == "i686-linux" then fetchurl { url = http://www.fmod.org/index.php/release/version/fmodapi42204linux.tar.gz; sha256 = "64eedc5b37c597eb925de446106d75cab0b5a79697d5ec048d34702812c08563"; - } else if (stdenv.system == "x86_64-linux") then + } else if stdenv.system == "x86_64-linux" then fetchurl { url = http://www.fmod.org/index.php/release/version/fmodapi42204linux64.tar.gz; sha256 = "3f2eec8265838a1005febe07c4971660e85010e4622911890642dc438746edf3"; diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 2333e42246b..6395b7ffc44 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ({ inherit kernelHeaders installLocales; # The host/target system. - crossConfig = if (cross != null) then cross.config else null; + crossConfig = if cross != null then cross.config else null; inherit (stdenv) is64bit; diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index ad524c21ff1..d229933111e 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -7,11 +7,11 @@ assert opensc.name == "opensc-0.11.7"; stdenv.mkDerivation rec { name = "libopensc-dnie-1.4.6-2"; - src = if (stdenv.system == "i686-linux") then (fetchurl { + src = if stdenv.system == "i686-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar; sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i"; }) - else if (stdenv.system == "x86_64-linux") then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar; + else if stdenv.system == "x86_64-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar; sha256 = "1py2bxavdcj0crhk1lwqzjgya5lvyhdfdbr4g04iysj56amxb7f9"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 679db72802c..5e15a63735e 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; - NIX_CFLAGS_COMPILE = if (enablePIC) then "-fPIC" else ""; + NIX_CFLAGS_COMPILE = if enablePIC then "-fPIC" else ""; propagatedBuildInputs = [ mesa freeglut SDL diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 5f49c3351fa..2f169f3f25d 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # BUILD_OUL wants old linux headers for videodev.h, not available # in stdenv linux headers cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF " - + (if (stdenv.system == "x86_64-linux") then + + (if stdenv.system == "x86_64-linux" then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else ""); diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix index 86f2e8cf2b2..f530ed70e37 100644 --- a/pkgs/development/tools/documentation/doxygen/1.7.nix +++ b/pkgs/development/tools/documentation/doxygen/1.7.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { ''; maintainers = [stdenv.lib.maintainers.simons]; - platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 07893987bbf..047da44a793 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { ''; maintainers = [stdenv.lib.maintainers.simons]; - platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } |