Skip to content

Commit

Permalink
doomseeker: add qt wrapper, cleanup (#79794)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bhipple and veprbl committed Feb 17, 2020
1 parent cfc21ad commit 5ef4af7
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions 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";

Expand All @@ -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/;
Expand Down

0 comments on commit 5ef4af7

Please sign in to comment.