diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2021-03-03 06:49:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 06:49:38 -0500 |
| commit | f209432103b502099a52b6d4f809c7328e739f78 (patch) | |
| tree | 21a68fb66a62a725cf5b8bd583f8c206af591c3f /pkgs/applications | |
| parent | 5da47b15cfb68f57865f28839c2325c8a43bca2c (diff) | |
| parent | 6667c07db00d953bf3afb8b5c9cce363641ffad2 (diff) | |
| download | nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar.gz nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar.bz2 nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar.lz nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar.xz nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.tar.zst nixpkgs-f209432103b502099a52b6d4f809c7328e739f78.zip | |
Merge pull request #114935 from aanderse/kodi-platform-name-fix
kodi: fix build for wayland and gbm
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index ced9c9d8b1c..f461838fdf1 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -231,7 +231,6 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" - "-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}" "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" "-Dlibdvdread_URL=${libdvdread.src}" @@ -251,9 +250,11 @@ in stdenv.mkDerivation { # I'm guessing there is a thing waiting to time out doCheck = false; - # Need these tools on the build system when cross compiling, - # hacky, but have found no other way. - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = '' + cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}") + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" |