diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/applications/virtualization/toolbox | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization/toolbox')
-rw-r--r-- | nixpkgs/pkgs/applications/virtualization/toolbox/default.nix | 51 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch | 12 |
2 files changed, 63 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix b/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix new file mode 100644 index 000000000000..94928ff35733 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/toolbox/default.nix @@ -0,0 +1,51 @@ +{ lib, buildGoModule, fetchFromGitHub, glibc, go-md2man, installShellFiles }: + +buildGoModule rec { + pname = "toolbox"; + version = "0.0.99.3"; + + src = fetchFromGitHub { + owner = "containers"; + repo = pname; + rev = version; + hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8="; + }; + + patches = [ ./glibc.patch ]; + + vendorHash = "sha256-k79TcC9voQROpJnyZ0RsqxJnBT83W5Z+D+D3HnuQGsI="; + + postPatch = '' + substituteInPlace src/cmd/create.go --subst-var-by glibc ${glibc} + ''; + + modRoot = "src"; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/containers/toolbox/pkg/version.currentVersion=${version}" + ]; + + preCheck = "export PATH=$GOPATH/bin:$PATH"; + + postInstall = '' + cd .. + for d in doc/*.md; do + go-md2man -in $d -out ''${d%.md} + done + installManPage doc/*.[1-9] + installShellCompletion --bash completion/bash/toolbox + install profile.d/toolbox.sh -Dt $out/share/profile.d + ''; + + meta = with lib; { + homepage = "https://containertoolbx.org"; + changelog = "https://github.com/containers/toolbox/releases/tag/${version}"; + description = "Tool for containerized command line environments on Linux"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch b/nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch new file mode 100644 index 000000000000..1055dc965a0b --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/toolbox/glibc.patch @@ -0,0 +1,12 @@ +diff --git a/src/cmd/create.go b/src/cmd/create.go +index 74e90b1..113ef80 100644 +--- a/src/cmd/create.go ++++ b/src/cmd/create.go +@@ -423,6 +425,7 @@ func createContainer(container, image, release string, showCommandToEnter bool) + "--volume", toolboxPathMountArg, + "--volume", usrMountArg, + "--volume", runtimeDirectoryMountArg, ++ "--volume", "@glibc@:@glibc@:ro", + }...) + + createArgs = append(createArgs, avahiSocketMount...) |