diff options
author | Aneesh Agrawal <aneeshusa@gmail.com> | 2016-08-25 17:11:27 -0400 |
---|---|---|
committer | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-01 16:13:41 +0200 |
commit | fcee1d0b28aa0f45f559d38659fd2a11cd34dafe (patch) | |
tree | 809af78a8471b509b0e0516df1d2fbb5817a4b83 /pkgs/applications | |
parent | 0e3e7a6bcd96405ddc257b93d57cda09b558cbdb (diff) | |
download | nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar.gz nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar.bz2 nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar.lz nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar.xz nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.tar.zst nixlib-fcee1d0b28aa0f45f559d38659fd2a11cd34dafe.zip |
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default. fixes #18000
Diffstat (limited to 'pkgs/applications')
7 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index d00dcafd7b8c..c5593a8d600b 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis qt zlib readline makeWrapper ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ]; + cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; preConfigure = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 3e76f6c36e71..33adacefb9de 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; }; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - buildInputs = [ qt4 zlib bzip2 ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix index 6ada451edf1b..2354c1377f96 100644 --- a/pkgs/applications/misc/webthree-umbrella/default.nix +++ b/pkgs/applications/misc/webthree-umbrella/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ - "-DCMAKE_BUILD_TYPE=Release" "-DGUI=${toString withGUI}" "-DETHASHCL=${toString withOpenCL}" "-DPROFILING=${toString withProfiling}" diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a22612993c5f..1d287f4100c2 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { zeitgeist ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" "-DHALF_BRO_INCOM_WEBKIT2=ON" "-DUSE_GTK3=1" diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 44cf13e2917c..904002c3b442 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { 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 = '' patchShebangs . diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 56fbf20f52d1..9cac49d5189a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; }) ]; - + sourceRoot = "kicad-${version}"; cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON -DKICAD_BUILD_VERSION=${version} -DKICAD_REPO_NAME=stable @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { postUnpack = '' pushd $(pwd) - ''; + ''; postInstall = '' popd @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { make $MAKE_FLAGS make install popd - + pushd kicad-footprints-* mkdir -p $out/share/kicad/modules cp -R *.pretty $out/share/kicad/modules/ diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 3bc1441212ee..e833b4afbbd2 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cd src ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; |