mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #189675 from veprbl/pr/libAfterImage_giflib5_fix
libAfterImage: fix compatibility with giflib 5
This commit is contained in:
commit
80d4d59152
1 changed files with 9 additions and 1 deletions
|
@ -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" ];
|
||||
|
||||
|
@ -74,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/";
|
||||
|
|
Loading…
Reference in a new issue