lol

Remove redundant -DCMAKE_BUILD_TYPE=Release flags

Since commit 183d05a0 in 2012, this is the default.

fixes #18000

authored by

Aneesh Agrawal and committed by
Jörg Thalheim
fcee1d0b 0e3e7a6b

+39 -83
+1 -1
pkgs/applications/audio/kid3/default.nix
··· 21 21 phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis 22 22 qt zlib readline makeWrapper ]; 23 23 24 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ]; 24 + cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; 25 25 NIX_LDFLAGS = "-lm -lpthread"; 26 26 27 27 preConfigure = ''
-2
pkgs/applications/misc/doomseeker/default.nix
··· 8 8 sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; 9 9 }; 10 10 11 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; 12 - 13 11 buildInputs = [ qt4 zlib bzip2 ]; 14 12 15 13 nativeBuildInputs = [ cmake pkgconfig ];
-1
pkgs/applications/misc/webthree-umbrella/default.nix
··· 49 49 }; 50 50 51 51 cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ 52 - "-DCMAKE_BUILD_TYPE=Release" 53 52 "-DGUI=${toString withGUI}" 54 53 "-DETHASHCL=${toString withOpenCL}" 55 54 "-DPROFILING=${toString withProfiling}"
+1 -2
pkgs/applications/networking/browsers/midori/default.nix
··· 41 41 zeitgeist 42 42 ]; 43 43 44 - cmakeFlags = [ 45 - "-DCMAKE_BUILD_TYPE=Release" 44 + cmakeFlags = [ 46 45 "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" 47 46 "-DHALF_BRO_INCOM_WEBKIT2=ON" 48 47 "-DUSE_GTK3=1"
+1 -1
pkgs/applications/networking/instant-messengers/kadu/default.nix
··· 19 19 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" 20 20 ''; 21 21 22 - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; 22 + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'"; 23 23 24 24 prePatch = '' 25 25 patchShebangs .
+3 -4
pkgs/applications/science/electronics/kicad/default.nix
··· 21 21 sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; 22 22 }) 23 23 ]; 24 - 24 + 25 25 sourceRoot = "kicad-${version}"; 26 26 27 27 cmakeFlags = '' 28 - -DCMAKE_BUILD_TYPE=Release 29 28 -DKICAD_SKIP_BOOST=ON 30 29 -DKICAD_BUILD_VERSION=${version} 31 30 -DKICAD_REPO_NAME=stable ··· 43 42 44 43 postUnpack = '' 45 44 pushd $(pwd) 46 - ''; 45 + ''; 47 46 48 47 postInstall = '' 49 48 popd ··· 53 52 make $MAKE_FLAGS 54 53 make install 55 54 popd 56 - 55 + 57 56 pushd kicad-footprints-* 58 57 mkdir -p $out/share/kicad/modules 59 58 cp -R *.pretty $out/share/kicad/modules/
-2
pkgs/applications/science/logic/lean/default.nix
··· 20 20 cd src 21 21 ''; 22 22 23 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; 24 - 25 23 postInstall = '' 26 24 wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin 27 25 '';
-2
pkgs/development/compilers/hhvm/default.nix
··· 46 46 patchShebangs . 47 47 ''; 48 48 49 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; 50 - 51 49 meta = { 52 50 description = "High-performance JIT compiler for PHP/Hack"; 53 51 homepage = "http://hhvm.com";
-1
pkgs/development/compilers/llvm/3.4/clang.nix
··· 20 20 buildInputs = [ cmake libedit libxml2 zlib ]; 21 21 22 22 cmakeFlags = [ 23 - "-DCMAKE_BUILD_TYPE=Release" 24 23 "-DCMAKE_CXX_FLAGS=-std=c++11" 25 24 "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" 26 25 ] ++
-1
pkgs/development/compilers/llvm/3.4/lld.nix
··· 14 14 buildInputs = [ cmake ncurses zlib python ]; 15 15 16 16 cmakeFlags = [ 17 - "-DCMAKE_BUILD_TYPE=Release" 18 17 "-DCMAKE_CXX_FLAGS=-std=c++11" 19 18 "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" 20 19 ];
-1
pkgs/development/compilers/llvm/3.4/lldb.nix
··· 26 26 buildInputs = [ cmake python which swig ncurses zlib libedit ]; 27 27 28 28 cmakeFlags = [ 29 - "-DCMAKE_BUILD_TYPE=Release" 30 29 "-DCMAKE_CXX_FLAGS=-std=c++11" 31 30 "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" 32 31 "-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
-1
pkgs/development/compilers/llvm/3.4/polly.nix
··· 10 10 buildInputs = [ cmake isl python gmp ]; 11 11 12 12 cmakeFlags = [ 13 - "-DCMAKE_BUILD_TYPE=Release" 14 13 "-DCMAKE_CXX_FLAGS=-std=c++11" 15 14 "-DLLVM_INSTALL_ROOT=${llvm}" 16 15 ];
-1
pkgs/development/compilers/llvm/3.5/clang.nix
··· 15 15 buildInputs = [ cmake libedit libxml2 llvm ]; 16 16 17 17 cmakeFlags = [ 18 - "-DCMAKE_BUILD_TYPE=Release" 19 18 "-DCMAKE_CXX_FLAGS=-std=c++11" 20 19 ] ++ 21 20 # Maybe with compiler-rt this won't be needed?
+6 -7
pkgs/development/compilers/llvm/3.5/libc++/default.nix
··· 24 24 25 25 buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 26 26 27 - cmakeFlags = 28 - [ "-DCMAKE_BUILD_TYPE=Release" 29 - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" 30 - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 31 - "-DLIBCXX_LIBCPPABI_VERSION=2" 32 - "-DLIBCXX_CXX_ABI=libcxxabi" 33 - ]; 27 + cmakeFlags = [ 28 + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" 29 + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 30 + "-DLIBCXX_LIBCPPABI_VERSION=2" 31 + "-DLIBCXX_CXX_ABI=libcxxabi" 32 + ]; 34 33 35 34 enableParallelBuilding = true; 36 35
-1
pkgs/development/compilers/llvm/3.5/lld.nix
··· 14 14 buildInputs = [ cmake ncurses zlib python ]; 15 15 16 16 cmakeFlags = [ 17 - "-DCMAKE_BUILD_TYPE=Release" 18 17 "-DCMAKE_CXX_FLAGS=-std=c++11" 19 18 "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" 20 19 ];
-1
pkgs/development/compilers/llvm/3.5/lldb.nix
··· 26 26 buildInputs = [ cmake python which swig ncurses zlib libedit ]; 27 27 28 28 cmakeFlags = [ 29 - "-DCMAKE_BUILD_TYPE=Release" 30 29 "-DCMAKE_CXX_FLAGS=-std=c++11" 31 30 "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" 32 31 "-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
-1
pkgs/development/compilers/llvm/3.5/polly.nix
··· 10 10 buildInputs = [ cmake isl python gmp ]; 11 11 12 12 cmakeFlags = [ 13 - "-DCMAKE_BUILD_TYPE=Release" 14 13 "-DCMAKE_CXX_FLAGS=-std=c++11" 15 14 "-DLLVM_INSTALL_ROOT=${llvm}" 16 15 ];
-1
pkgs/development/compilers/llvm/3.6/clang/default.nix
··· 16 16 buildInputs = [ cmake libedit libxml2 llvm ]; 17 17 18 18 cmakeFlags = [ 19 - "-DCMAKE_BUILD_TYPE=Release" 20 19 "-DCMAKE_CXX_FLAGS=-std=c++11" 21 20 ] ++ 22 21 # Maybe with compiler-rt this won't be needed?
+6 -7
pkgs/development/compilers/llvm/3.6/libc++/default.nix
··· 19 19 20 20 buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 21 21 22 - cmakeFlags = 23 - [ "-DCMAKE_BUILD_TYPE=Release" 24 - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" 25 - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 26 - "-DLIBCXX_LIBCPPABI_VERSION=2" 27 - "-DLIBCXX_CXX_ABI=libcxxabi" 28 - ]; 22 + cmakeFlags = [ 23 + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" 24 + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 25 + "-DLIBCXX_LIBCPPABI_VERSION=2" 26 + "-DLIBCXX_CXX_ABI=libcxxabi" 27 + ]; 29 28 30 29 enableParallelBuilding = true; 31 30
-1
pkgs/development/compilers/llvm/3.6/lldb.nix
··· 26 26 buildInputs = [ cmake python which swig ncurses zlib libedit ]; 27 27 28 28 cmakeFlags = [ 29 - "-DCMAKE_BUILD_TYPE=Release" 30 29 "-DCMAKE_CXX_FLAGS=-std=c++11" 31 30 "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" 32 31 "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
-1
pkgs/development/compilers/llvm/3.7/clang/default.nix
··· 16 16 buildInputs = [ cmake libedit libxml2 llvm ]; 17 17 18 18 cmakeFlags = [ 19 - "-DCMAKE_BUILD_TYPE=Release" 20 19 "-DCMAKE_CXX_FLAGS=-std=c++11" 21 20 ] ++ 22 21 # Maybe with compiler-rt this won't be needed?
+5 -6
pkgs/development/compilers/llvm/3.7/libc++/default.nix
··· 18 18 19 19 buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 20 20 21 - cmakeFlags = 22 - [ "-DCMAKE_BUILD_TYPE=Release" 23 - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 24 - "-DLIBCXX_LIBCPPABI_VERSION=2" 25 - "-DLIBCXX_CXX_ABI=libcxxabi" 26 - ]; 21 + cmakeFlags = [ 22 + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 23 + "-DLIBCXX_LIBCPPABI_VERSION=2" 24 + "-DLIBCXX_CXX_ABI=libcxxabi" 25 + ]; 27 26 28 27 enableParallelBuilding = true; 29 28
-1
pkgs/development/compilers/llvm/3.7/lldb.nix
··· 31 31 ''; 32 32 33 33 cmakeFlags = [ 34 - "-DCMAKE_BUILD_TYPE=Release" 35 34 "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" 36 35 "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" 37 36 "-DPYTHON_VERSION_MAJOR=2"
-1
pkgs/development/compilers/llvm/3.8/clang/default.nix
··· 16 16 buildInputs = [ cmake libedit libxml2 llvm python ]; 17 17 18 18 cmakeFlags = [ 19 - "-DCMAKE_BUILD_TYPE=Release" 20 19 "-DCMAKE_CXX_FLAGS=-std=c++11" 21 20 ] ++ 22 21 # Maybe with compiler-rt this won't be needed?
+5 -6
pkgs/development/compilers/llvm/3.8/libc++/default.nix
··· 18 18 19 19 buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; 20 20 21 - cmakeFlags = 22 - [ "-DCMAKE_BUILD_TYPE=Release" 23 - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 24 - "-DLIBCXX_LIBCPPABI_VERSION=2" 25 - "-DLIBCXX_CXX_ABI=libcxxabi" 26 - ]; 21 + cmakeFlags = [ 22 + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" 23 + "-DLIBCXX_LIBCPPABI_VERSION=2" 24 + "-DLIBCXX_CXX_ABI=libcxxabi" 25 + ]; 27 26 28 27 enableParallelBuilding = true; 29 28
-1
pkgs/development/compilers/llvm/3.8/lldb.nix
··· 33 33 ''; 34 34 35 35 cmakeFlags = [ 36 - "-DCMAKE_BUILD_TYPE=Release" 37 36 "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" 38 37 "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" 39 38 "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
-1
pkgs/development/compilers/mono/llvm.nix
··· 41 41 postBuild = "rm -fR $out"; 42 42 43 43 cmakeFlags = with stdenv; [ 44 - "-DCMAKE_BUILD_TYPE=Release" 45 44 "-DLLVM_ENABLE_FFI=ON" 46 45 "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" 47 46 "-DCMAKE_CXX_FLAGS=-std=c++11"
-1
pkgs/development/libraries/cpp-netlib/default.nix
··· 13 13 14 14 cmakeFlags = [ 15 15 "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" 16 - "-DCMAKE_BUILD_TYPE=RELEASE" 17 16 ]; 18 17 19 18 enableParallelBuilding = true;
-4
pkgs/development/libraries/openbr/default.nix
··· 18 18 19 19 enableParallelBuilding = true; 20 20 21 - cmakeFlags = [ 22 - "-DCMAKE_BUILD_TYPE=Release" 23 - ]; 24 - 25 21 meta = { 26 22 description = "Open Source Biometric Recognition"; 27 23 homepage = http://openbiometrics.org/;
-1
pkgs/development/libraries/stxxl/default.nix
··· 20 20 cmakeFlags = [ 21 21 "-DBUILD_SHARED_LIBS=ON" 22 22 "-DBUILD_STATIC_LIBS=OFF" 23 - "-DCMAKE_BUILD_TYPE=Release" 24 23 (mkFlag parallel "USE_GNU_PARALLEL") 25 24 ]; 26 25
-4
pkgs/games/eternity-engine/default.nix
··· 7 7 sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; 8 8 }; 9 9 10 - cmakeFlags = '' 11 - -DCMAKE_BUILD_TYPE=Release 12 - ''; 13 - 14 10 buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; 15 11 16 12 enableParallelBuilding = true;
-4
pkgs/games/odamex/default.nix
··· 7 7 sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; 8 8 }; 9 9 10 - cmakeFlags = '' 11 - -DCMAKE_BUILD_TYPE=Release 12 - ''; 13 - 14 10 buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; 15 11 16 12 enableParallelBuilding = true;
+5 -2
pkgs/games/openspades/default.nix
··· 23 23 sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h 24 24 ''; 25 25 26 - nativeBuildInputs = 26 + nativeBuildInputs = 27 27 [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] 28 28 ++ lib.optional withOpenal openal; 29 29 30 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; 30 + cmakeFlags = [ 31 + "-DOPENSPADES_INSTALL_BINARY=bin" 32 + "-DOPENSPADES_RESOURCES=NO" 33 + ]; 31 34 32 35 enableParallelBuilding = true; 33 36
+5 -2
pkgs/games/openspades/git.nix
··· 16 16 17 17 postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp"; 18 18 19 - nativeBuildInputs = 19 + nativeBuildInputs = 20 20 with stdenv.lib; 21 21 [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] 22 22 ++ lib.optional withOpenal openal; 23 23 24 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; 24 + cmakeFlags = [ 25 + "-DOPENSPADES_INSTALL_BINARY=bin" 26 + "-DOPENSPADES_RESOURCES=NO" 27 + ]; 25 28 26 29 #enableParallelBuilding = true; 27 30
-1
pkgs/misc/emulators/dolphin-emu/default.nix
··· 18 18 -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include 19 19 -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include 20 20 -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 21 - -DCMAKE_BUILD_TYPE=Release 22 21 -DENABLE_LTO=True 23 22 ''; 24 23
-1
pkgs/misc/emulators/dolphin-emu/master.nix
··· 16 16 -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include 17 17 -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include 18 18 -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 19 - -DCMAKE_BUILD_TYPE=Release 20 19 -DENABLE_LTO=True 21 20 ''; 22 21
-4
pkgs/misc/screensavers/xss-lock/default.nix
··· 13 13 buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau 14 14 libXdmcp xcbutil ]; 15 15 16 - cmakeFlags = [ 17 - "-DCMAKE_BUILD_TYPE=Release" 18 - ]; 19 - 20 16 meta = with stdenv.lib; { 21 17 description = "Use external locker (such as i3lock) as X screen saver"; 22 18 license = licenses.mit;
+1 -1
pkgs/os-specific/linux/conky/default.nix
··· 102 102 ++ optional weatherXoapSupport libxml2 103 103 ; 104 104 105 - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] 105 + cmakeFlags = [] 106 106 ++ optional docsSupport "-DMAINTAINER_MODE=ON" 107 107 ++ optional curlSupport "-DBUILD_CURL=ON" 108 108 ++ optional (!ibmSupport) "-DBUILD_IBM=OFF"
-2
pkgs/tools/filesystems/darling-dmg/default.nix
··· 13 13 14 14 buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; 15 15 16 - cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"]; 17 - 18 16 meta = { 19 17 homepage = http://www.darlinghq.org/; 20 18 description = "Darling lets you open OS X dmgs on Linux";