From bbbb21dbe8b7abae42785cabd51b0387eed14d5a Mon Sep 17 00:00:00 2001 From: Palmer Cox Date: Thu, 14 May 2026 14:13:51 +0000 Subject: [PATCH] nethack: Only patch the QT settings if qtMode is enabled By doing this we reduce the closure size of the build environment when qtMode is disabled. --- pkgs/by-name/ne/nethack/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix index 43f3b46dca9f..0ecec40a1144 100644 --- a/pkgs/by-name/ne/nethack/package.nix +++ b/pkgs/by-name/ne/nethack/package.nix @@ -119,8 +119,6 @@ stdenv.mkDerivation (finalAttrs: { -e 's,^CFLAGS=-g,CFLAGS=,' \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ - -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ - -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ -e 's,NHCFLAGS+=-DCOMPRESS[^ ]*,NHCFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ -DCOMPRESS_EXTENSION=\\".gz\\",' \ -i sys/unix/hints/linux.500 @@ -133,9 +131,6 @@ stdenv.mkDerivation (finalAttrs: { -e 's,^CFLAGS+=-DCRASHREPORT,#CFLAGS+=-DCRASHREPORT,' \ -e 's,^NHCFLAGS+=-DGREPPATH,#NHCFLAGS+=-DGREPPATH,' \ -e 's,/usr/bin/true,${coreutils}/bin/true,g' \ - -e 's,^endif # QTDIR,endif # QTDIR \ - QTDIR=${qt5.qtbase.dev},' \ - -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ -e 's,NHCFLAGS+=-DCOMPRESS[^ ]*,NHCFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\ -DCOMPRESS_EXTENSION=\\".gz\\",' \ -i sys/unix/hints/macOS.500 @@ -149,6 +144,19 @@ stdenv.mkDerivation (finalAttrs: { sed \ -e 's,AR =.*,AR := $(AR),' \ -i sys/unix/Makefile.src + ${lib.optionalString qtMode + '' + sed \ + -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \ + -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ + -i sys/unix/hints/linux.500 + sed \ + -e 's,^endif # QTDIR,endif # QTDIR \ + QTDIR=${qt5.qtbase.dev},' \ + -e 's,PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig,,' \ + -i sys/unix/hints/macOS.500 + '' + } ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) # If we're cross-compiling, replace the paths to the data generation tools # with the ones from the build platform's nethack package, since we can't