From 4d99f4884e456620d8e8048930bbd26e486d750a Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 15 Jan 2021 17:48:59 +0800
Subject: [PATCH] example-user-env: matplotlib-qt issues

---
 artiq-full/example-user-env.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/artiq-full/example-user-env.nix b/artiq-full/example-user-env.nix
index 098c0a7..d190a71 100644
--- a/artiq-full/example-user-env.nix
+++ b/artiq-full/example-user-env.nix
@@ -1,4 +1,7 @@
 { pkgs, artiq-full }:
+let
+  matplotlib-qt = (pkgs.python3Packages.matplotlib.override { enableQt = true; });
+in
 {
   artiq-example-user-env = pkgs.runCommand "artiq-example-user-env" {
     buildInputs = [
@@ -17,10 +20,11 @@
         ps.numpy
         ps.scipy
         ps.numba
-        (ps.matplotlib.override { enableQt = true; })
         ps.bokeh
-        ps.cirq
-        ps.qiskit
+        matplotlib-qt
+        (ps.cirq.override { matplotlib = matplotlib-qt; })
+        # qiskit does not work with matplotlib-qt
+        #ps.qiskit
       ]))
 
       artiq-full.openocd