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..8b8d97b 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": 1700565411, + "narHash": "sha256-b/q38V6H2xTRQNMU1a7u5CKUWkWlRR23doJ1lrh1dPI=", + "ref": "visr", + "rev": "4bba6abfbfab69c0ac0c1dd045733ce597df36f6", + "revCount": 11, + "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}" ''; }