Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates. There's glibc 2.18 -> .19 bump and many non-intrusive PRs. The grsecurity branch #1187 got removed at Eelco's request, see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, perl, xz }:
|
||||
{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-5.2";
|
||||
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses perl xz ];
|
||||
buildInputs = [ perl xz ]
|
||||
++ stdenv.lib.optional interactive ncurses;
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
|
||||
Reference in New Issue
Block a user