From 6905b9d80ab5d574dd49bdc391c72f0b2a8a326e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 17 Jul 2025 17:56:56 +0200 Subject: [PATCH] redshift: drop autotools patch --- pkgs/applications/misc/redshift/575.patch | 51 --------------------- pkgs/applications/misc/redshift/default.nix | 5 -- 2 files changed, 56 deletions(-) delete mode 100644 pkgs/applications/misc/redshift/575.patch diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch deleted file mode 100644 index f5beeb6ce518..000000000000 --- a/pkgs/applications/misc/redshift/575.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 -From: Yana Timoshenko -Date: Tue, 16 Jan 2018 11:43:46 +0000 -Subject: [PATCH] Fix Autoconf script - -gettext/intltool macros are not used correctly, see: -https://bugs.launchpad.net/inkscape/+bug/1418943 ---- - bootstrap | 6 +----- - configure.ac | 5 +---- - 2 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/bootstrap b/bootstrap -index 0599cf5..40b1dca 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -1,7 +1,3 @@ - #!/bin/sh - --# change to root directory --cd $(dirname "$0") -- --autopoint --force && \ -- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose -+autoreconf --force --install && intltoolize -diff --git a/configure.ac b/configure.ac -index be0b51a..a2e7c42 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules - AC_LANG([C]) - - AC_PROG_INTLTOOL([0.50]) -+AC_SUBST(LIBINTL) - - AC_CANONICAL_HOST - -@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ - ]) - AC_LANG_POP([Objective C]) - --# Checks for libraries. --AM_GNU_GETTEXT_VERSION([0.17]) --AM_GNU_GETTEXT([external]) -- - GETTEXT_PACKAGE=redshift - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) --- -2.15.1 - diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 0780b6812c7d..5ec4714ad7d9 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -51,11 +51,6 @@ let meta ; - patches = lib.optionals (pname != "gammastep") [ - # https://github.com/jonls/redshift/pull/575 - ./575.patch - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ];