diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mapbox-gl-native')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix index 47b9ba63fc2d..f9212ea7cba9 100644 --- a/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -35,6 +35,11 @@ mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native"; hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI="; }) + (fetchpatch { + name = "fix-narrowing-conversion.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/2955d0e479f57a39a0af4a0fa7ca7683455cca58.patch"; + hash = "sha256-Jk7OLb9/mVtc2mm0AL1h9zcSiQ54jogNI+q6ojY0HEo="; + }) ]; postPatch = '' @@ -50,7 +55,7 @@ mkDerivation rec { "-DMBGL_WITH_QT_LIB_ONLY=ON" "-DMBGL_WITH_QT_HEADLESS=OFF" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; meta = with lib; { description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; |