diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 13:17:10 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 18:17:46 -0500 |
commit | 49455d7bae2f81c5c984faa6728c9017123fa798 (patch) | |
tree | 082b609e249a69c865c992f8c6f014d6cadbe7aa /pkgs/servers | |
parent | 11f0e07d4fc3791a3318950bc70bc53b2828af6b (diff) | |
download | nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar.gz nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar.bz2 nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar.lz nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar.xz nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.tar.zst nixlib-49455d7bae2f81c5c984faa6728c9017123fa798.zip |
treewide: replace utillinux refs of {u,}mount
umount and mount are now provided top-level
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/apcupsd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/interlock/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/2.x.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/5.x.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 9 |
6 files changed, 18 insertions, 29 deletions
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 04285621e5c9..bec61d460a7a 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # There is no real reason for a bin/sbin split, so just use bin. preConfigure = '' export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown - export ac_cv_path_WALL=${utillinux}/bin/wall + export ac_cv_path_WALL=${wall}/bin/wall sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure export configureFlags="\ --bindir=$out/bin \ diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index a0b59d332a3f..0df055f9690f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +, mount, umount +, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "interlock-${version}"; @@ -23,8 +24,8 @@ buildGoPackage rec { buildFlags = [ "-tags textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ - -e 's|/bin/mount|${utillinux}/bin/mount|' \ - -e 's|/bin/umount|${utillinux}/bin/umount|' \ + -e 's|/bin/mount|${mount}/bin/mount|' \ + -e 's|/bin/umount|${umount}/bin/umount|' \ -e 's|/bin/cp|${coreutils}/bin/cp|' \ -e 's|/bin/mv|${coreutils}/bin/mv|' \ -e 's|/bin/chown|${coreutils}/bin/chown|' \ diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 30beec7b873d..28244d1b3dcd 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { mv $out/bin/plugin $out/bin/elasticsearch-plugin wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" ''; diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 0d27e4fefcc8..f46ca9c0cb3f 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -24,9 +23,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 6057c2dee82c..5594fe35b737 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }: with stdenv.lib; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env ''; - buildInputs = [ makeWrapper jre_headless ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out @@ -27,9 +26,7 @@ stdenv.mkDerivation rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin/" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 16f010302902..f4780603f502 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -25,9 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ |