MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #189675 from veprbl/pr/libAfterImage_giflib5_fix

Browse source 
libAfterImage: fix compatibility with giflib 5
This commit is contained in:
Dmitry Kalinkin 2022-09-10 10:00:21 -04:00 committed by GitHub
commit 80d4d59152
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/libAfterImage/default.nix
View file

@ -54,6 +54,13 @@ stdenv.mkDerivation {
# workaround '-p0' patchflags below. # workaround '-p0' patchflags below.
stripLen = 1; 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" ]; patchFlags = [ "-p0" ];
@ -74,7 +81,8 @@ stdenv.mkDerivation {
"--disable-mmx-optimization" "--disable-mmx-optimization"
"--${if static then "enable" else "disable"}-staticlibs" "--${if static then "enable" else "disable"}-staticlibs"
"--${if !static then "enable" else "disable"}-sharedlibs" "--${if !static then "enable" else "disable"}-sharedlibs"
] ++ lib.optional withX "--with-x"; "--${if withX then "with" else "without"}-x"
];
meta = with lib; { meta = with lib; {
homepage = "http://www.afterstep.org/afterimage/"; homepage = "http://www.afterstep.org/afterimage/";