JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #73040 from marius851000/gnash

Browse Source 
gnash: fix compilation with libgif 5.2
This commit is contained in:
Timo Kaufmann 2019-11-21 22:37:12 +01:00 committed by GitHub
commit 51751e1ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/gnash/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoreconfHook { stdenv, fetchgit, fetchpatch, autoreconfHook
, pkgconfig, libtool, boost, SDL , pkgconfig, libtool, boost, SDL
, glib, pango, gettext, curl, xorg , glib, pango, gettext, curl, xorg
, libpng, libjpeg, giflib, speex, atk , libpng, libjpeg, giflib, speex, atk
@ -93,6 +93,13 @@ stdenv.mkDerivation {
++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enablePlugins [ xulrunner npapi_sdk ]
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ];
patches = [
(fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873
url = "https://savannah.gnu.org/patch/download.php?file_id=47859";
sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y";
})
];
configureFlags = with stdenv.lib; [ configureFlags = with stdenv.lib; [
"--with-boost-incl=${boost.dev}/include" "--with-boost-incl=${boost.dev}/include"
"--with-boost-lib=${boost.out}/lib" "--with-boost-lib=${boost.out}/lib"