diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
| commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
| tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/SDL | |
| parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
| parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
| download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/SDL')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh index 553e8553a77f..54a9b3e8bfab 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/SDL/setup-hook.sh @@ -1,9 +1,15 @@ addSDLPath () { if [ -e "$1/include/SDL" ]; then export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" - fi - if [ -e "$1/lib" ]; then - export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + # NB this doesn’t work with split dev packages because different packages + # will contain "include/SDL/" and "lib/" directories. + # + # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate + # libraries like SDL_mixer, SDL_image, etc which are not split-package + # so the check above will only trigger on them. + if [ -e "$1/lib" ]; then + export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + fi fi } |