about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-09-15 12:16:44 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-15 12:16:49 -0700
commit773b4deb7c5c6300f23f2ec2db4751e40f6520fa (patch)
tree45e1caaa95b76b129efe46e8c048be03c91f3baf /pkgs/applications/video
parent316a09377d12b29764b5daf51e0df8986a5fe175 (diff)
parenta6f6c0eeeb45ad122022366724e396955f0f775b (diff)
Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/gnash/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index fc773211f69bb..5a170047e8fce 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -117,5 +117,6 @@ stdenv.mkDerivation rec {
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;
+    broken = true;
   };
 } // {mozillaPlugin = "/plugins";}