diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:54:15 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:54:15 +0100 |
commit | 84779a6f7da93bd6325f478c62c82cc0a1a2e341 (patch) | |
tree | 554971a930d84656bb952ba0f9a328ef08e70c72 /pkgs/development/libraries | |
parent | e2d505b24e50e16e3634478d565c7c9988b1d90f (diff) | |
download | nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.gz nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.bz2 nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.lz nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.xz nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.zst nixpkgs-84779a6f7da93bd6325f478c62c82cc0a1a2e341.zip |
Remove unnecessary parentheses around if conditions
Pet peeve...
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/1.44.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.46.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.47.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.49.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.51.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.52.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/fmod/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libopensc-dnie/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/plib/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/vxl/default.nix | 2 |
11 files changed, 21 insertions, 21 deletions
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 ""); |