From dd45320d78685ca568ff5e3f513172be6c5a32e1 Mon Sep 17 00:00:00 2001
From: Thomas Nixon <tom@tomn.co.uk>
Date: Mon, 20 Nov 2023 15:36:54 +0000
Subject: [PATCH] update VISR

- switch to branch in BEAR repository rather than a zip
- misc updates from 0.13 branch
- update pybind11 to 2.11.1 (see #12)
- fix missing includes (see #12)
- switch to C++14 for new versions of boost
---
 README.md    |  5 +++--
 flake.lock   | 16 ++++++++++------
 flake.nix    |  4 +++-
 nix/visr.nix |  4 ++--
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 36e4e58..161b929 100644
--- a/README.md
+++ b/README.md
@@ -125,9 +125,10 @@ To reformat code to match the existing style, run `black` on any changed sources
 
 ### VISR
 
-Get VISR 0.13.0 or greater. Currently this is available here:
+Get VISR 0.13.0 or greater. Currently this is available in the `visr` branch of this repository, or here:
 
-https://github.com/ebu/bear/releases/download/v0.0.1-pre/visr-0.13.0-pre-5e13f020.zip
+- zip: https://github.com/ebu/bear/archive/refs/heads/visr.zip
+- tar.gz: https://github.com/ebu/bear/archive/refs/heads/visr.tar.gz
 
 Eventually this will be available from the upstream repository:
 
diff --git a/flake.lock b/flake.lock
index a33f46d..f1125f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,14 +94,18 @@
     "visr_src": {
       "flake": false,
       "locked": {
-        "lastModified": 1643817083,
-        "narHash": "sha256-B+x/wRJgHyWxw3TlMabEK9C6vbH2mr8NwAvPAqn8+ck=",
-        "type": "tarball",
-        "url": "https://github.com/ebu/bear/releases/download/v0.0.1-pre/visr-0.13.0-pre-5e13f020.zip"
+        "lastModified": 1700488344,
+        "narHash": "sha256-5gSadAKqJV2mSpxX8kzE4CBc9UMb5Fayske9sFQ1C+8=",
+        "ref": "visr",
+        "rev": "e079a420a8e21304fe39064abca9c6057455cd57",
+        "revCount": 10,
+        "type": "git",
+        "url": "https://github.com/ebu/bear.git"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/ebu/bear/releases/download/v0.0.1-pre/visr-0.13.0-pre-5e13f020.zip"
+        "ref": "visr",
+        "type": "git",
+        "url": "https://github.com/ebu/bear.git"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 2cf6f48..17671b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,9 @@
   };
 
   inputs.visr_src = {
-    url = "https://github.com/ebu/bear/releases/download/v0.0.1-pre/visr-0.13.0-pre-5e13f020.zip";
+    type = "git";
+    url = "https://github.com/ebu/bear.git";
+    ref = "visr";
     flake = false;
   };
 
diff --git a/nix/visr.nix b/nix/visr.nix
index d336517..3d681e7 100644
--- a/nix/visr.nix
+++ b/nix/visr.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_STANDALONE_APPLICATIONS=false"
   ];
   postPatch = ''
-    sed -i "s%set( PYTHON_MODULE_INSTALL_DIRECTORY .*$%set( PYTHON_MODULE_INSTALL_DIRECTORY \"$out/${python.sitePackages}\")%" CMakeLists.txt
-    sed -i 's/ADD_SUBDIRECTORY( apps )//' src/CMakeLists.txt
+    substituteInPlace CMakeLists.txt \
+      --replace "\''${VISR_TOPLEVEL_INSTALL_DIRECTORY}/python" "$out/${python.sitePackages}"
   '';
 }