diff options
| author | Justin Bedo <cu@cua0.org> | 2022-11-02 10:14:57 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2022-11-02 10:14:57 +1100 |
| commit | 1249b086768178bfaadfc1b9ff61881f2f2c4d64 (patch) | |
| tree | 4145ea3e0e482365c9fade5be6bfdd15753a7cbc /pkgs/development/r-modules | |
| parent | 644b5a7ac7c5ff72b8602434ad43a2e7bb3614d7 (diff) | |
| download | nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar.gz nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar.bz2 nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar.lz nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar.xz nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.tar.zst nixpkgs-1249b086768178bfaadfc1b9ff61881f2f2c4d64.zip | |
rPackages.RNifti: fix build
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/r-modules/patches/RNifti.patch | 33 |
2 files changed, 0 insertions, 37 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5607e18cc94..7571c81ac32 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1324,10 +1324,6 @@ let Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: { propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.hdf5.dev ]; }); - - RNifti = old.RNifti.overrideDerivation (attrs: { - patches = [ ./patches/RNifti.patch ]; - }); }; in self diff --git a/pkgs/development/r-modules/patches/RNifti.patch b/pkgs/development/r-modules/patches/RNifti.patch deleted file mode 100644 index e8f3561e750..00000000000 --- a/pkgs/development/r-modules/patches/RNifti.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 05e8a1e..2dcde81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,16 +17,5 @@ CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` - CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` - LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` - --# Checks for libraries. --ZLIB_FLAGS="-Izlib" --ZLIB_OBJECTS=`ls -1 src/zlib/*.c | sed 's/^src\///' | sed 's/\\.c$/\\.o/'` --AC_SEARCH_LIBS([inflate], [z], [ -- ZLIB_FLAGS="" -- ZLIB_OBJECTS="" --]) -- --AC_SUBST(ZLIB_FLAGS) --AC_SUBST(ZLIB_OBJECTS) -- - AC_CONFIG_FILES([src/Makevars]) - AC_OUTPUT -diff --git a/src/Makevars.in b/src/Makevars.in -index 77da572..358cc1d 100644 ---- a/src/Makevars.in -+++ b/src/Makevars.in -@@ -1,5 +1,5 @@ --PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include @ZLIB_FLAGS@ -+PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include - PKG_LIBS = @LIBS@ - - NIFTI_OBJECTS = znzlib/znzlib.o niftilib/nifti1_io.o niftilib/nifti2_io.o --OBJECTS = main.o zzz.o @ZLIB_OBJECTS@ $(NIFTI_OBJECTS) -+OBJECTS = main.o zzz.o $(NIFTI_OBJECTS) |