From dd6728ca40bfa6de9dafde35341dfb85eb5916b7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 02:24:15 +0100 Subject: [PATCH] bppsuite: remove stdenv overrides --- .../science/biology/bpp-core/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 20 +++++-------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index 953fe50a4b03..0d0e3c114920 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "bpp-core"; @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; }; + patches = [ + (fetchpatch { + url = "https://github.com/BioPP/bpp-core/commit/d450e8033b06e80dff9c2236fb7ce1f3ced5dcbb.patch"; + hash = "sha256-9t68mrK7KNs5BxljKMaA+XskCcKDNv8DNCVUYunoNdw="; + }) + ]; + nativeBuildInputs = [ cmake ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e6879dd8aa..6760b0e1e0e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38935,25 +38935,15 @@ with pkgs; blast-bin = callPackage ../applications/science/biology/blast/bin.nix { }; - bpp-core = callPackage ../development/libraries/science/biology/bpp-core { - stdenv = gcc10StdenvCompat; - }; + bpp-core = callPackage ../development/libraries/science/biology/bpp-core { }; - bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { - stdenv = gcc10StdenvCompat; - }; + bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { }; - bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { - stdenv = gcc10StdenvCompat; - }; + bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { }; - bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { - stdenv = gcc10StdenvCompat; - }; + bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { }; - bppsuite = callPackage ../applications/science/biology/bppsuite { - stdenv = gcc10StdenvCompat; - }; + bppsuite = callPackage ../applications/science/biology/bppsuite { }; cd-hit = callPackage ../applications/science/biology/cd-hit { inherit (llvmPackages) openmp;