From 60a7d2e58dc4da15dd5f8d2e9c87ec94845a3a68 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2022 22:25:49 -0400 Subject: [PATCH 1/2] libAfterImage: fix compatibility with giflib 5 --- pkgs/development/libraries/libAfterImage/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index b414d79b0ad2..3bbbe49eb294 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation { # workaround '-p0' patchflags below. stripLen = 1; }) + + # fix https://github.com/root-project/root/issues/10990 + (fetchpatch { + url = "https://github.com/root-project/root/pull/11243/commits/e177a477b0be05ef139094be1e96a99ece06350a.diff"; + hash = "sha256-2DQmJGHmATHawl3dk9dExncVe1sXzJQyy4PPwShoLTY="; + stripLen = 5; + }) ]; patchFlags = [ "-p0" ]; From fa5155a4e5994774267a6bd529e5f175d203fd4e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2022 22:27:02 -0400 Subject: [PATCH 2/2] libAfterImage: pass --without-x explicitly This fixes build on GitHub Actions macOS machines. --- pkgs/development/libraries/libAfterImage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 3bbbe49eb294..a569b59621e0 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation { "--disable-mmx-optimization" "--${if static then "enable" else "disable"}-staticlibs" "--${if !static then "enable" else "disable"}-sharedlibs" - ] ++ lib.optional withX "--with-x"; + "--${if withX then "with" else "without"}-x" + ]; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/";