diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/maplibre-gl-native')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix b/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix index c680f6822b5d..65a5c266ee6a 100644 --- a/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/maplibre-gl-native/default.nix @@ -9,18 +9,19 @@ , libuv , glfw3 , rapidjson +, stdenv }: mkDerivation rec { pname = "maplibre-gl-native"; - version = "unstable-2022-04-07"; + version = "2.0.1"; src = fetchFromGitHub { owner = "maplibre"; repo = "maplibre-gl-native"; - rev = "225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806"; + rev = "qt-v${version}"; fetchSubmodules = true; - hash = "sha256-NLtpi+bDLTHlnzMZ4YFQyF5B1xt9lzHyZPvEQLlBAnY="; + hash = "sha256-g5J873U/6mrl27iquPl3BdEGhMxkOdfP15dHr27wa48="; }; patches = [ @@ -55,12 +56,16 @@ mkDerivation rec { "-DMBGL_WITH_QT_HEADLESS=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=use-after-free" + ]); + meta = with lib; { description = "Open-source alternative to Mapbox GL Native"; homepage = "https://maplibre.org/"; license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.15"; }; } |