From 4da5755bcfbad9752ee839f2ca1ba48c6bf91fd8 Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Sat, 27 Feb 2021 22:57:04 +0000 Subject: [PATCH 1/3] nix: fix "common.sh: line 94: unshare: command not found" --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 50eb8d1a47e6d..365e117f5ddd5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,7 +10,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz - , bash, coreutils, gzip, gnutar + , bash, coreutils, utillinux, gzip, gnutar , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive @@ -40,7 +40,7 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkg-config ] + [ pkg-config utillinux ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive From ec3db35aaa3a4a849b53624a9f0827d326e0a2fe Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Sun, 28 Feb 2021 00:26:41 +0000 Subject: [PATCH 2/3] Update pkgs/tools/package-management/nix/default.nix Co-authored-by: Cole Helbling --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 365e117f5ddd5..5244cf22f4107 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,7 +10,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz - , bash, coreutils, utillinux, gzip, gnutar + , bash, coreutils, util-linux, gzip, gnutar , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive From 96a62db50e1bcc49623f06e09c667702171094be Mon Sep 17 00:00:00 2001 From: kvtb <76634406+kvtb@users.noreply.github.com> Date: Sun, 28 Feb 2021 00:26:49 +0000 Subject: [PATCH 3/3] Update pkgs/tools/package-management/nix/default.nix Co-authored-by: Cole Helbling --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5244cf22f4107..c3d8655861f84 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -40,7 +40,7 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkg-config utillinux ] + [ pkg-config util-linux ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive