From 827c5e45f8cd294f00f022cf38896a7168046b93 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:51:21 +0100 Subject: [PATCH] lemon-graph: unbreak on all platforms --- pkgs/development/libraries/lemon-graph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix index 04f0514781bf..81c21bb68d69 100644 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; + # error: no viable conversion from ... + doCheck = !stdenv.isDarwin; meta = with lib; { homepage = "https://lemon.cs.elte.hu/trac/lemon"; @@ -23,6 +24,5 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ trepetti ]; platforms = platforms.all; - broken = stdenv.isAarch64 || stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612613a9e0b3..a9aa16af4fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19991,7 +19991,9 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; - lemon-graph = callPackage ../development/libraries/lemon-graph { }; + lemon-graph = callPackage ../development/libraries/lemon-graph { + stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + }; levmar = callPackage ../development/libraries/levmar { };