From f215189d1d47f580e018c6153d0cee19d53e883a Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Wed, 28 Jan 2015 09:20:00 +0100
Subject: [PATCH] Make openjdk work with nonreparenting wms

---
 .../compilers/openjdk/nonreparenting-wm.patch | 39 +++++++++++++++++++
 .../compilers/openjdk/openjdk8.nix            |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/nonreparenting-wm.patch

diff --git a/pkgs/development/compilers/openjdk/nonreparenting-wm.patch b/pkgs/development/compilers/openjdk/nonreparenting-wm.patch
new file mode 100644
index 00000000000..49db6fb1ea6
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/nonreparenting-wm.patch
@@ -0,0 +1,39 @@
+--- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2014-09-06 18:41:39.018530981 -0400
++++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2014-09-06 18:46:43.098540372 -0400
+@@ -104,7 +104,8 @@
+         COMPIZ_WM = 12,
+         LG3D_WM = 13,
+         CWM_WM = 14,
+-        MUTTER_WM = 15;
++        MUTTER_WM = 15,
++        OTHER_NONREPARENTING_WM = 16;
+     public String toString() {
+         switch  (WMID) {
+           case NO_WM:
+@@ -596,7 +597,7 @@
+     }
+ 
+     static boolean isNonReparentingWM() {
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+     }
+ 
+     /*
+@@ -786,6 +787,9 @@
+             } else if (doIsIceWM && isIceWM()) {
+                 awt_wmgr = XWM.ICE_WM;
+             }
++            else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++            }
+             /*
+              * We don't check for legacy WM when we already know that WM
+              * supports WIN or _NET wm spec.
+@@ -1332,6 +1336,7 @@
+                   res = new Insets(28, 6, 6, 6);
+                   break;
+               case NO_WM:
++              case OTHER_NONREPARENTING_WM:
+               case LG3D_WM:
+                   res = zeroInsets;
+                   break;
\ No newline at end of file
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index fa9c64a6ea6..7ef238e03bc 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation {
     ./fix-java-home.patch
     ./read-truststore-from-env-jdk8.patch
     ./currency-date-range-jdk8.patch
+    ./nonreparenting-wm.patch
   ];
   preConfigure = ''
     chmod +x configure