Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 072edcbe3795
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7deb982d6a81
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 10, 2019

  1. r-systemfonts: fix package dependencies

    @dylex @peti
    dylex authored and peti committed Oct 10, 2019
    Copy the full SHA
    13085f1 View commit details

  2. r-systemfonts: fix shebang of configure script 

    Closes #70813.
    @peti
    peti committed Oct 10, 2019
    Copy the full SHA
    7deb982 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/r-modules/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/r-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -357,6 +357,7 @@ let
stringi = [ pkgs.icu.dev ];
survSNP = [ pkgs.gsl_1 ];
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ];
TAQMNGR = [ pkgs.zlib.dev ];
tesseract = [ pkgs.tesseract pkgs.leptonica ];
tiff = [ pkgs.libtiff.dev ];
@@ -424,6 +425,7 @@ let
spate = [ pkgs.pkgconfig ];
stringi = [ pkgs.pkgconfig ];
sysfonts = [ pkgs.pkgconfig ];
systemfonts = [ pkgs.pkgconfig ];
tesseract = [ pkgs.pkgconfig ];
Cairo = [ pkgs.pkgconfig ];
Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ];
@@ -947,6 +949,10 @@ let
preConfigure = "patchShebangs configure";
});

systemfonts = old.systemfonts.overrideDerivation (attrs: {
preConfigure = "patchShebangs configure";
});

littler = old.littler.overrideAttrs (attrs: with pkgs; {
buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs;
postInstall = ''