summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/gnash
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-11-24 10:07:55 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-11-24 10:07:55 +0100
commitab0a828662c4c6a8535b630081a67c20286099ab (patch)
treed172e1d2739947b35ecd23890c4f6f8ef0d585be /pkgs/misc/gnash
parent65edeb8633de16792a84195f77a6b4ea408e2608 (diff)
parent2dea86498412e797b8bf43ca38ebb2a7f9e5766b (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/gnash')
-rw-r--r--pkgs/misc/gnash/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index e866a1937d69..2efaa98d67b0 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook
+{ stdenv, fetchgit, fetchpatch, autoreconfHook
, pkgconfig, libtool, boost, SDL
, glib, pango, gettext, curl, xorg
, libpng, libjpeg, giflib, speex, atk
@@ -93,6 +93,13 @@ stdenv.mkDerivation {
++ optionals enablePlugins [ xulrunner npapi_sdk ]
++ 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; [
"--with-boost-incl=${boost.dev}/include"
"--with-boost-lib=${boost.out}/lib"