b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove redundant -DCMAKE_BUILD_TYPE=Release flags

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

fixes #18000
This commit is contained in:
Aneesh Agrawal 2016-08-25 17:11:27 -04:00 committed by Jörg Thalheim
parent 0e3e7a6bcd
commit fcee1d0b28
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
39 changed files with 39 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/kid3/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis
qt zlib readline makeWrapper ]; qt zlib readline makeWrapper ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
NIX_LDFLAGS = "-lm -lpthread"; NIX_LDFLAGS = "-lm -lpthread";
preConfigure = '' preConfigure = ''

2
pkgs/applications/misc/doomseeker/default.nix
View file

@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw";
}; };
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
buildInputs = [ qt4 zlib bzip2 ]; buildInputs = [ qt4 zlib bzip2 ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

1
pkgs/applications/misc/webthree-umbrella/default.nix
View file

@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
}; };
cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [
"-DCMAKE_BUILD_TYPE=Release"
"-DGUI=${toString withGUI}" "-DGUI=${toString withGUI}"
"-DETHASHCL=${toString withOpenCL}" "-DETHASHCL=${toString withOpenCL}"
"-DPROFILING=${toString withProfiling}" "-DPROFILING=${toString withProfiling}"

3
pkgs/applications/networking/browsers/midori/default.nix
View file

@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
zeitgeist zeitgeist
]; ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}"
"-DHALF_BRO_INCOM_WEBKIT2=ON" "-DHALF_BRO_INCOM_WEBKIT2=ON"
"-DUSE_GTK3=1" "-DUSE_GTK3=1"

2
pkgs/applications/networking/instant-messengers/kadu/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
''; '';
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";
prePatch = '' prePatch = ''
patchShebangs . patchShebangs .

7
pkgs/applications/science/electronics/kicad/default.nix
View file

@ -21,11 +21,10 @@ stdenv.mkDerivation rec {
sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg";
}) })
]; ];
sourceRoot = "kicad-${version}"; sourceRoot = "kicad-${version}";
cmakeFlags = '' cmakeFlags = ''
-DCMAKE_BUILD_TYPE=Release
-DKICAD_SKIP_BOOST=ON -DKICAD_SKIP_BOOST=ON
-DKICAD_BUILD_VERSION=${version} -DKICAD_BUILD_VERSION=${version}
-DKICAD_REPO_NAME=stable -DKICAD_REPO_NAME=stable
@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
pushd $(pwd) pushd $(pwd)
''; '';
postInstall = '' postInstall = ''
popd popd
@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
make $MAKE_FLAGS make $MAKE_FLAGS
make install make install
popd popd
pushd kicad-footprints-* pushd kicad-footprints-*
mkdir -p $out/share/kicad/modules mkdir -p $out/share/kicad/modules
cp -R *.pretty $out/share/kicad/modules/ cp -R *.pretty $out/share/kicad/modules/

2
pkgs/applications/science/logic/lean/default.nix
View file

@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
cd src cd src
''; '';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
''; '';

2
pkgs/development/compilers/hhvm/default.nix
View file

@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
meta = { meta = {
description = "High-performance JIT compiler for PHP/Hack"; description = "High-performance JIT compiler for PHP/Hack";
homepage = "http://hhvm.com"; homepage = "http://hhvm.com";

1
pkgs/development/compilers/llvm/3.4/clang.nix
View file

@ -20,7 +20,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake libedit libxml2 zlib ]; buildInputs = [ cmake libedit libxml2 zlib ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
] ++ ] ++

1
pkgs/development/compilers/llvm/3.4/lld.nix
View file

@ -14,7 +14,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake ncurses zlib python ]; buildInputs = [ cmake ncurses zlib python ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
]; ];

1
pkgs/development/compilers/llvm/3.4/lldb.nix
View file

@ -26,7 +26,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake python which swig ncurses zlib libedit ]; buildInputs = [ cmake python which swig ncurses zlib libedit ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}"

1
pkgs/development/compilers/llvm/3.4/polly.nix
View file

@ -10,7 +10,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake isl python gmp ]; buildInputs = [ cmake isl python gmp ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLVM_INSTALL_ROOT=${llvm}" "-DLLVM_INSTALL_ROOT=${llvm}"
]; ];

1
pkgs/development/compilers/llvm/3.5/clang.nix
View file

@ -15,7 +15,6 @@ in stdenv.mkDerivation {
buildInputs = [ cmake libedit libxml2 llvm ]; buildInputs = [ cmake libedit libxml2 llvm ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ ] ++
# Maybe with compiler-rt this won't be needed? # Maybe with compiler-rt this won't be needed?

13
pkgs/development/compilers/llvm/3.5/libc++/default.nix
View file

@ -24,13 +24,12 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=Release" "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"
"-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi"
"-DLIBCXX_CXX_ABI=libcxxabi" ];
];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/development/compilers/llvm/3.5/lld.nix
View file

@ -14,7 +14,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake ncurses zlib python ]; buildInputs = [ cmake ncurses zlib python ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
]; ];

1
pkgs/development/compilers/llvm/3.5/lldb.nix
View file

@ -26,7 +26,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake python which swig ncurses zlib libedit ]; buildInputs = [ cmake python which swig ncurses zlib libedit ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}"

1
pkgs/development/compilers/llvm/3.5/polly.nix
View file

@ -10,7 +10,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake isl python gmp ]; buildInputs = [ cmake isl python gmp ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLVM_INSTALL_ROOT=${llvm}" "-DLLVM_INSTALL_ROOT=${llvm}"
]; ];

1
pkgs/development/compilers/llvm/3.6/clang/default.nix
View file

@ -16,7 +16,6 @@ let
buildInputs = [ cmake libedit libxml2 llvm ]; buildInputs = [ cmake libedit libxml2 llvm ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ ] ++
# Maybe with compiler-rt this won't be needed? # Maybe with compiler-rt this won't be needed?

13
pkgs/development/compilers/llvm/3.6/libc++/default.nix
View file

@ -19,13 +19,12 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=Release" "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"
"-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi"
"-DLIBCXX_CXX_ABI=libcxxabi" ];
];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/development/compilers/llvm/3.6/lldb.nix
View file

@ -26,7 +26,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake python which swig ncurses zlib libedit ]; buildInputs = [ cmake python which swig ncurses zlib libedit ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"

1
pkgs/development/compilers/llvm/3.7/clang/default.nix
View file

@ -16,7 +16,6 @@ let
buildInputs = [ cmake libedit libxml2 llvm ]; buildInputs = [ cmake libedit libxml2 llvm ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ ] ++
# Maybe with compiler-rt this won't be needed? # Maybe with compiler-rt this won't be needed?

11
pkgs/development/compilers/llvm/3.7/libc++/default.nix
View file

@ -18,12 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=Release" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi"
"-DLIBCXX_CXX_ABI=libcxxabi" ];
];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/development/compilers/llvm/3.7/lldb.nix
View file

@ -31,7 +31,6 @@ stdenv.mkDerivation {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
"-DPYTHON_VERSION_MAJOR=2" "-DPYTHON_VERSION_MAJOR=2"

1
pkgs/development/compilers/llvm/3.8/clang/default.nix
View file

@ -16,7 +16,6 @@ let
buildInputs = [ cmake libedit libxml2 llvm python ]; buildInputs = [ cmake libedit libxml2 llvm python ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
] ++ ] ++
# Maybe with compiler-rt this won't be needed? # Maybe with compiler-rt this won't be needed?

11
pkgs/development/compilers/llvm/3.8/libc++/default.nix
View file

@ -18,12 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=Release" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi"
"-DLIBCXX_CXX_ABI=libcxxabi" ];
];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/development/compilers/llvm/3.8/lldb.nix
View file

@ -33,7 +33,6 @@ stdenv.mkDerivation {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"

1
pkgs/development/compilers/mono/llvm.nix
View file

@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
postBuild = "rm -fR $out"; postBuild = "rm -fR $out";
cmakeFlags = with stdenv; [ cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"

1
pkgs/development/libraries/cpp-netlib/default.nix
View file

@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
"-DCMAKE_BUILD_TYPE=RELEASE"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/openbr/default.nix
View file

@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
meta = { meta = {
description = "Open Source Biometric Recognition"; description = "Open Source Biometric Recognition";
homepage = http://openbiometrics.org/; homepage = http://openbiometrics.org/;

1
pkgs/development/libraries/stxxl/default.nix
View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF"
"-DCMAKE_BUILD_TYPE=Release"
(mkFlag parallel "USE_GNU_PARALLEL") (mkFlag parallel "USE_GNU_PARALLEL")
]; ];

4
pkgs/games/eternity-engine/default.nix
View file

@ -7,10 +7,6 @@ stdenv.mkDerivation rec {
sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4";
}; };
cmakeFlags = ''
-DCMAKE_BUILD_TYPE=Release
'';
buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/games/odamex/default.nix
View file

@ -7,10 +7,6 @@ stdenv.mkDerivation rec {
sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a";
}; };
cmakeFlags = ''
-DCMAKE_BUILD_TYPE=Release
'';
buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ];
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/games/openspades/default.nix
View file

@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h
''; '';
nativeBuildInputs = nativeBuildInputs =
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
++ lib.optional withOpenal openal; ++ lib.optional withOpenal openal;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; cmakeFlags = [
"-DOPENSPADES_INSTALL_BINARY=bin"
"-DOPENSPADES_RESOURCES=NO"
];
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/games/openspades/git.nix
View file

@ -16,12 +16,15 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp"; postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
nativeBuildInputs = nativeBuildInputs =
with stdenv.lib; with stdenv.lib;
[ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
++ lib.optional withOpenal openal; ++ lib.optional withOpenal openal;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; cmakeFlags = [
"-DOPENSPADES_INSTALL_BINARY=bin"
"-DOPENSPADES_RESOURCES=NO"
];
#enableParallelBuilding = true; #enableParallelBuilding = true;

1
pkgs/misc/emulators/dolphin-emu/default.nix
View file

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True -DENABLE_LTO=True
''; '';

1
pkgs/misc/emulators/dolphin-emu/master.nix
View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True -DENABLE_LTO=True
''; '';

4
pkgs/misc/screensavers/xss-lock/default.nix
View file

@ -13,10 +13,6 @@ stdenv.mkDerivation {
buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau
libXdmcp xcbutil ]; libXdmcp xcbutil ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Use external locker (such as i3lock) as X screen saver"; description = "Use external locker (such as i3lock) as X screen saver";
license = licenses.mit; license = licenses.mit;

2
pkgs/os-specific/linux/conky/default.nix
View file

@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
++ optional weatherXoapSupport libxml2 ++ optional weatherXoapSupport libxml2
; ;
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] cmakeFlags = []
++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional docsSupport "-DMAINTAINER_MODE=ON"
++ optional curlSupport "-DBUILD_CURL=ON" ++ optional curlSupport "-DBUILD_CURL=ON"
++ optional (!ibmSupport) "-DBUILD_IBM=OFF" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF"

2
pkgs/tools/filesystems/darling-dmg/default.nix
View file

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"];
meta = { meta = {
homepage = http://www.darlinghq.org/; homepage = http://www.darlinghq.org/;
description = "Darling lets you open OS X dmgs on Linux"; description = "Darling lets you open OS X dmgs on Linux";