Merge pull request #273243 from wegank/bppsuite-stdenv

bppsuite: remove stdenv overrides
This commit is contained in:
Nick Cao 2023-12-10 11:52:24 -05:00 committed by GitHub
commit e8f1aa89c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions

View File

@ -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 = ''

View File

@ -38926,25 +38926,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;