summaryrefslogtreecommitdiffstats
path: root/pkgs/os-specific/windows
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-11-11 20:47:51 -0500
committerJohn Ericson <git@JohnEricson.me>2019-11-11 20:48:14 -0500
commit16f0fe7fe37722ccdc696cf7338cc3e5676346b0 (patch)
tree66aea0e7108c1817eb99466e731d32d172b9e2d0 /pkgs/os-specific/windows
parent63eac673199d78b2dcd061904811445addad3822 (diff)
parente3b76760e38912e5b3298dfc19f9c75e7ed2ffd9 (diff)
Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads
Diffstat (limited to 'pkgs/os-specific/windows')
-rw-r--r--pkgs/os-specific/windows/wxMSW-2.8/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 65690af98697..2764c4232c16 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -31,5 +31,7 @@ stdenv.mkDerivation {
meta = {
platforms = stdenv.lib.platforms.windows;
+
+ broken = true;
};
}