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

@@ -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:
 

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;
   };
 

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}"
   '';
 }