From 365d891d4abee8e2bfba217982e84184af40e731 Mon Sep 17 00:00:00 2001 From: Martijn Vermaat Date: Fri, 27 May 2016 01:27:50 +0200 Subject: [PATCH] cloud-utils: fix dependence on gnused in $PATH The cloud-utils package was extracted from inline use in `amazon-grow-partition` where it used `gnused` in the initrd, probably for legacy reasons. Now that it can be used separately, it should use just `sed` which is provided by the stdenv. Also, `amazon-grow-partition` can now do away with the `gnused` alias. --- nixos/modules/virtualisation/amazon-grow-partition.nix | 1 - pkgs/tools/misc/cloud-utils/default.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-grow-partition.nix b/nixos/modules/virtualisation/amazon-grow-partition.nix index 69b80d900bad9..6f56b0f97a431 100644 --- a/nixos/modules/virtualisation/amazon-grow-partition.nix +++ b/nixos/modules/virtualisation/amazon-grow-partition.nix @@ -11,7 +11,6 @@ copy_bin_and_libs ${pkgs.gnused}/bin/sed copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart - ln -s sed $out/bin/gnused ''; boot.initrd.postDeviceCommands = '' diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index fa03962bcdc41..3a104907b9d22 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation { mkdir -p $out/bin cp bin/growpart $out/bin/growpart sed -i 's|awk|gawk|' $out/bin/growpart - sed -i 's|sed|gnused|' $out/bin/growpart ''; dontInstall = true; dontPatchShebangs = true;