Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(nix): update audio resource patch

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2021-06-23 08:52:04 +03:00
parent 16633cc3ec
commit 1b3a8db8d4
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -24,11 +24,11 @@
"rustOverlay": "rustOverlay" "rustOverlay": "rustOverlay"
}, },
"locked": { "locked": {
"lastModified": 1624129119, "lastModified": 1624414763,
"narHash": "sha256-Mq7SkCA35dEEbWWfO8by94/+sZbvWfv3P8ByxNCVmOg=", "narHash": "sha256-+urGJyMUNUZhDJQjIs7/1Q+lMqtgh/dseMViZlss0ug=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "4018999c0998137c34b81ff2ff032d719cd25096", "rev": "cf46cfce46bcea48fc68abc8199f2615ad12c272",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1623862044, "lastModified": 1624353498,
"narHash": "sha256-mY7nldu9Wl/Yb0qMPihZrWw0bRWXNsk6iyYztw/6F6Y=", "narHash": "sha256-Edpj+fDbn9p9TSiDDXEUxUk9j12imolnjSzZutXhGG4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0747387223edf1aa5beaedf48983471315d95e16", "rev": "b27eaa18b47b77fbbf9f3bd7a17046b2d64b637b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
"rustOverlay": { "rustOverlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1624069337, "lastModified": 1624414452,
"narHash": "sha256-9mTcx7osE4biF2Hm/GU19s1T3+KvphWj4QaUcJh39lU=", "narHash": "sha256-vvnagNTPTT3zcPNjD8Gz7STHniQkc3+9cs+4h2pcuVU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "67dc2a9543a7c24591e6cb102ad0121c3a704aab", "rev": "09149337f9899b4b9fa6e4f3889467e8646c9fc5",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
nix/nullOggPatch.nix
View File

@ -3,16 +3,17 @@ pkgs.writeText
"nullOgg.patch" "nullOgg.patch"
'' ''
diff --git a/src/audio/soundcache.rs b/src/audio/soundcache.rs 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 --- a/src/audio/soundcache.rs
+++ b/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 { pub fn empty() -> OggSound {
OggSound(Arc::new( SoundLoader::load(
- include_bytes!("../../../assets/voxygen/audio/null.ogg").to_vec(), - Cow::Borrowed(include_bytes!("../../../assets/voxygen/audio/null.ogg")),
+ include_bytes!("${nullOgg}").to_vec(), + Cow::Borrowed(include_bytes!("${nullOgg}")),
)) "empty",
} )
} .unwrap()
'' ''