diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-24 10:13:31 +0100 |
commit | 1d18c5a0fe6d55fa1663e945cd47bc9e8e764f3f (patch) | |
tree | 313bc0caa017c3e41a961bf63c7b70aac8bc6334 /pkgs/misc/gnash | |
parent | 525c54c7ef4ac6bc86e1a9f84cff72af43884d2a (diff) | |
parent | ab0a828662c4c6a8535b630081a67c20286099ab (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/gnash')
-rw-r--r-- | pkgs/misc/gnash/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 287000bf4e3af..cfc0c3f7301ac 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 @@ -95,6 +95,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" |