diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
| commit | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (patch) | |
| tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/misc | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| parent | 12949bf84ab06bebb854a07082bf5c32f5e14892 (diff) | |
| download | nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.gz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.bz2 nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.lz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.xz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.zst nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/gnash/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index c0b86336163d..8aeabebbefea 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -9,7 +9,7 @@ , enableOpenGL ? false, libGLU_combined ? null # GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null +, enableGTK ? true, gtk2 ? null, gnome2 ? null , enableSDL ? false , enableQt ? false, qt4 ? null @@ -27,7 +27,7 @@ with stdenv.lib; -let +let available = x: x != null; sound = @@ -52,7 +52,7 @@ assert enableCairo -> available cairo; assert enableOpenGL -> available libGLU_combined; # GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; +assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; assert enableSDL -> available SDL; assert enableQt -> available qt4; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ++ optional enableJemalloc jemalloc ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] + ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ] ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; configureFlags = with stdenv.lib; [ |