From 07daeb25727a8237348d35520a8ceed99768ab1e Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 3 Jul 2019 21:29:24 +0800
Subject: [PATCH] artiq-board: make Python module again

---
 artiq/artiq-board.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/artiq/artiq-board.nix b/artiq/artiq-board.nix
index 05d36ed..7e42596 100644
--- a/artiq/artiq-board.nix
+++ b/artiq/artiq-board.nix
@@ -45,7 +45,9 @@ let
   vivado = import ./vivado.nix { inherit pkgs; };
   artiqpkgs = import ./default.nix { inherit pkgs; };
 
-in pkgs.stdenv.mkDerivation rec {
+# Board packages are Python modules so that they get added to the ARTIQ Python
+# environment, and artiq_flash finds them.
+in pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
   name = "artiq-board-${target}-${variant}-${version}";
   version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
   phases = [ "buildPhase" "installCheckPhase" "installPhase" ];
@@ -90,4 +92,4 @@ in pkgs.stdenv.mkDerivation rec {
     fi
     ${extraInstallCommands}
     '';
-}
+})