diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/games/gemrb | |
parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/games/gemrb')
-rw-r--r-- | nixpkgs/pkgs/games/gemrb/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/games/gemrb/default.nix b/nixpkgs/pkgs/games/gemrb/default.nix index 77c9c7adaf9f..947957bc3af6 100644 --- a/nixpkgs/pkgs/games/gemrb/default.nix +++ b/nixpkgs/pkgs/games/gemrb/default.nix @@ -20,6 +20,10 @@ let backend = if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES"; + withVLC = stdenv.isDarwin; + + inherit (lib) optional optionalString; + in stdenv.mkDerivation rec { pname = "gemrb"; @@ -39,19 +43,23 @@ stdenv.mkDerivation rec { libGL libiconv libpng - libvlc libvorbis openal python2 zlib - ]; + ] + ++ optional withVLC libvlc; nativeBuildInputs = [ cmake ]; - LIBVLC_INCLUDE_PATH = "${lib.getDev libvlc}/include"; - LIBVLC_LIBRARY_PATH = "${lib.getLib libvlc}/lib"; + # libvlc isn't being detected properly as of 0.9.0, so set it + LIBVLC_INCLUDE_PATH = optionalString withVLC "${lib.getDev libvlc}/include"; + LIBVLC_LIBRARY_PATH = optionalString withVLC "${lib.getLib libvlc}/lib"; cmakeFlags = [ + "-DDATA_DIR=${placeholder "out"}/share/gemrb" + "-DEXAMPLE_CONF_DIR=${placeholder "out"}/share/doc/gemrb/examples" + "-DSYSCONF_DIR=/etc" # use the Mesa drivers for video on ARM (harmless on x86) "-DDISABLE_VIDEOCORE=ON" "-DLAYOUT=opt" |