nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-18 13:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #141405 from jbedo/r-updates

Browse Source 
rPackages: build fixes
This commit is contained in:
Justin Bedő
2021-10-15 07:38:18 +11:00
committed by GitHub
parent 3b19ff90f9 4c96ee566d
commit 63e7fa39cc
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/r-modules/default.nix
View File

@@ -513,6 +513,9 @@ let
Rbowtie = with pkgs; [ zlib.dev ];
gaston = with pkgs; [ zlib.dev ];
csaw = with pkgs; [ zlib.dev curl ];
DirichletMultinomial = with pkgs; [ gsl ];
DiffBind = with pkgs; [ zlib.dev ];
CNEr = with pkgs; [ zlib ];
};
packagesRequiringX = [
@@ -882,10 +885,6 @@ let
PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
});
EMCluster = old.EMCluster.overrideDerivation (attrs: {
patches = [ ./patches/EMCluster.patch ];
});
spMC = old.spMC.overrideDerivation (attrs: {
patches = [ ./patches/spMC.patch ];
});

6
pkgs/development/r-modules/patches/EMCluster.patch
View File

@@ -1,6 +0,0 @@
diff -ru -x '*~' EMCluster_orig/src/Makevars EMCluster/src/Makevars
--- EMCluster_orig/src/Makevars 2013-07-05 02:43:25.000000000 +0900
+++ EMCluster/src/Makevars 2014-10-25 18:10:19.190992120 +0900
@@ -1 +1 @@
-PKG_LIBS = $(FLIBS) $(BLAS_LIBS) $(LAPACK_LIBS)
+PKG_LIBS = $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)