diff --git a/flake.lock b/flake.lock index 206ff4bf46..2d3567a0ab 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "rustOverlay": "rustOverlay" }, "locked": { - "lastModified": 1624129119, - "narHash": "sha256-Mq7SkCA35dEEbWWfO8by94/+sZbvWfv3P8ByxNCVmOg=", + "lastModified": 1624414763, + "narHash": "sha256-+urGJyMUNUZhDJQjIs7/1Q+lMqtgh/dseMViZlss0ug=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "4018999c0998137c34b81ff2ff032d719cd25096", + "rev": "cf46cfce46bcea48fc68abc8199f2615ad12c272", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1623862044, - "narHash": "sha256-mY7nldu9Wl/Yb0qMPihZrWw0bRWXNsk6iyYztw/6F6Y=", + "lastModified": 1624353498, + "narHash": "sha256-Edpj+fDbn9p9TSiDDXEUxUk9j12imolnjSzZutXhGG4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0747387223edf1aa5beaedf48983471315d95e16", + "rev": "b27eaa18b47b77fbbf9f3bd7a17046b2d64b637b", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "rustOverlay": { "flake": false, "locked": { - "lastModified": 1624069337, - "narHash": "sha256-9mTcx7osE4biF2Hm/GU19s1T3+KvphWj4QaUcJh39lU=", + "lastModified": 1624414452, + "narHash": "sha256-vvnagNTPTT3zcPNjD8Gz7STHniQkc3+9cs+4h2pcuVU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "67dc2a9543a7c24591e6cb102ad0121c3a704aab", + "rev": "09149337f9899b4b9fa6e4f3889467e8646c9fc5", "type": "github" }, "original": { diff --git a/nix/nullOggPatch.nix b/nix/nullOggPatch.nix index 27f22303a4..2362b6f5d9 100644 --- a/nix/nullOggPatch.nix +++ b/nix/nullOggPatch.nix @@ -3,16 +3,17 @@ pkgs.writeText "nullOgg.patch" '' diff --git a/src/audio/soundcache.rs b/src/audio/soundcache.rs - index 8cf703577..678295cac 100644 + index f08a4bdab..c2036336e 100644 --- a/src/audio/soundcache.rs +++ b/src/audio/soundcache.rs - @@ -44,7 +44,7 @@ impl OggSound { - + @@ -38,7 +38,7 @@ impl OggSound { + pub fn empty() -> OggSound { - OggSound(Arc::new( - - include_bytes!("../../../assets/voxygen/audio/null.ogg").to_vec(), - + include_bytes!("${nullOgg}").to_vec(), - )) - } - } + SoundLoader::load( + - Cow::Borrowed(include_bytes!("../../../assets/voxygen/audio/null.ogg")), + + Cow::Borrowed(include_bytes!("${nullOgg}")), + "empty", + ) + .unwrap() '' +