diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch index 0f9c2abad3c3..796642aa3c89 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch +++ b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch @@ -1,12 +1,12 @@ -diff -Nuar a/Alc/helpers.c b/Alc/helpers.c ---- a/Alc/helpers.c 1970-01-01 00:00:01.000000000 +0000 -+++ b/Alc/helpers.c 1970-01-01 00:00:02.000000000 +0000 -@@ -951,6 +951,8 @@ - } - } +diff --git a/alc/helpers.cpp b/alc/helpers.cpp +index 8c1c856..19bbc0f 100644 +--- a/alc/helpers.cpp ++++ b/alc/helpers.cpp +@@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) -+ DirectorySearch("@OUT@/share", ext, &results); -+ - alstr_reset(&path); + DirectorySearch(path.c_str(), ext, &results); } ++ DirectorySearch("@OUT@/share/", ext, &results); + return results; + } |