public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utillinux: rename to util-linux

Browse Source
This commit is contained in:
Graham Christensen
2020-11-24 12:42:06 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/search/elasticsearch/6.x.nix
+3 -3
View File
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux, gnugrep, coreutils
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
buildInputs = [ makeWrapper jre_headless utillinux ]
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
chmod -x $out/bin/*.*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
pkgs/servers/search/elasticsearch/7.x.nix
+3 -3
View File
@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux, gnugrep, coreutils
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
buildInputs = [ makeWrapper jre_headless utillinux ]
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
chmod +x $out/bin/*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
--prefix PATH : "${makeBinPath [ util-linux coreutils gnugrep ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"