From c6624909de29736a1693d4f76acba5c55ffd9c9b Mon Sep 17 00:00:00 2001
From: Las Safin <me@las.rs>
Date: Fri, 3 Sep 2021 13:46:33 +0000
Subject: [PATCH] Keep backward compatibility for cumulus users

---
 cumulus/src/CMakeLists.txt | 20 ++++++++++----------
 nix/cumulus.nix            |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cumulus/src/CMakeLists.txt b/cumulus/src/CMakeLists.txt
index 7b97e5f2..ffef310b 100644
--- a/cumulus/src/CMakeLists.txt
+++ b/cumulus/src/CMakeLists.txt
@@ -80,14 +80,14 @@
                                        ${CMAKE_CURRENT_SOURCE_DIR}/plugins/alpha/macro/macro.py
                   )
          
-          install ( FILES    ${pySources}          DESTINATION ${PYTHON_SITE_PACKAGES} )
-          install ( FILES    ${pyPlugins}          DESTINATION ${PYTHON_SITE_PACKAGES}/plugins )
-          install ( FILES    ${pyPluginCTS}        DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/cts )
-          install ( FILES    ${pyPluginC2C}        DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/core2chip )
-          install ( FILES    ${pyPluginChip}       DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/chip )
-          install ( FILES    ${pyPluginAlpha}      DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha )
-          install ( FILES    ${pyPluginAlphaBlock} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/block )
-          install ( FILES    ${pyPluginAlphaC2C}   DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/core2chip )
-          install ( FILES    ${pyPluginAlphaChip}  DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/chip )
-          install ( FILES    ${pyPluginAlphaMacro} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/macro )
+          install ( FILES    ${pySources}          DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus )
+          install ( FILES    ${pyPlugins}          DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins )
+          install ( FILES    ${pyPluginCTS}        DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/cts )
+          install ( FILES    ${pyPluginC2C}        DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/core2chip )
+          install ( FILES    ${pyPluginChip}       DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/chip )
+          install ( FILES    ${pyPluginAlpha}      DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha )
+          install ( FILES    ${pyPluginAlphaBlock} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/block )
+          install ( FILES    ${pyPluginAlphaC2C}   DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/core2chip )
+          install ( FILES    ${pyPluginAlphaChip}  DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/chip )
+          install ( FILES    ${pyPluginAlphaMacro} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/macro )
           install ( PROGRAMS ${pyTools}            DESTINATION bin ) 
diff --git a/nix/cumulus.nix b/nix/cumulus.nix
index c05d292b..0b85d253 100644
--- a/nix/cumulus.nix
+++ b/nix/cumulus.nix
@@ -3,13 +3,15 @@
 let pkg =
   { lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore
   , coriolis-etesian, coriolis-anabatic, coriolis-katana
-  , coriolis-unicorn }:
+  , coriolis-unicorn, python2Packages }:
   {
     name = "cumulus";
 
     src = ../cumulus;
 
     postInstall = ''
+      ln -s -t $out/${python2Packages.python.sitePackages} $out/${python2Packages.python.sitePackages}/cumulus/*
+
       # for import check
       mkdir -p /build/coriolistop/etc/coriolis2
       export CORIOLIS_TOP=/build/coriolistop