From 5ef4af7afcaa3b85cf936efabe46b481b9dea3b7 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 17 Feb 2020 04:50:44 -0500 Subject: [PATCH] doomseeker: add qt wrapper, cleanup (#79794) This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable. The hack is also only needed for darwin sources and is not specific to clang. Co-authored-by: Dmitry Kalinkin --- pkgs/applications/misc/doomseeker/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fbe21dd9a5b..da36e89db1f 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation { +mkDerivation { pname = "doomseeker"; version = "2018-03-05"; @@ -13,13 +13,10 @@ stdenv.mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; + nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/;