about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2020-02-17 04:50:44 -0500
committerGitHub <noreply@github.com>2020-02-17 04:50:44 -0500
commit5ef4af7afcaa3b85cf936efabe46b481b9dea3b7 (patch)
tree5ec7e7979cad221217b1e39b48e7cdfac1ba026e /pkgs/applications/misc
parentcfc21ad059c2bd850deee0d75350144c2cd4d4b8 (diff)
downloadnixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar.gz
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar.bz2
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar.lz
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar.xz
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.tar.zst
nixlib-5ef4af7afcaa3b85cf936efabe46b481b9dea3b7.zip
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 <dmitry.kalinkin@gmail.com>
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/doomseeker/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fbe21dd9a5b2..da36e89db1fa 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 ];
 
-  buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
-
   nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
+  buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
 
-  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/;