diff -Nru nux-4.0.8+17.10.20170922/debian/50_check_unity_support nux-4.0.8+17.10.20180613.3/debian/50_check_unity_support
--- nux-4.0.8+17.10.20170922/debian/50_check_unity_support	2018-06-13 15:38:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/50_check_unity_support	2018-06-13 15:38:15.000000000 +0000
@@ -2,6 +2,18 @@
 # If the hardware does not pass unity_support_test, fall back to LLVMpipe
 # which does.
 
-if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
-    /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
+if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
+    (
+        IFS=':'
+        for d in $XDG_CURRENT_DESKTOP; do
+            if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
+                return 0
+            fi
+        done
+        return 1
+    )
+
+    if [ $? = 0 ]; then
+        /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
+    fi
 fi
diff -Nru nux-4.0.8+17.10.20170922/debian/changelog nux-4.0.8+17.10.20180613.3/debian/changelog
--- nux-4.0.8+17.10.20170922/debian/changelog	2018-06-13 15:38:15.000000000 +0000
+++ nux-4.0.8+17.10.20180613.3/debian/changelog	2018-06-13 15:38:15.000000000 +0000
@@ -1,3 +1,12 @@
+nux (4.0.8+17.10.20180613.3-0ubuntu1) artful; urgency=medium
+
+  * debian/50_check_unity_support:
+    - various changes to fix (LP: #1768610):
+      + export LIBGL_ALWAYS_SOFTWARE=1 only on command failure
+      + run only when called inside an unity session
+
+ -- Marco Trevisan (Treviño) <mail@3v1n0.net>  Wed, 13 Jun 2018 12:22:05 +0000
+
 nux (4.0.8+17.10.20170922-0ubuntu1) artful; urgency=medium
 
   * Nux: mark explicit fallthrough jumps (to please gcc7)