Removed cross and podman

main
Johannes Hendrik Gerard van der Weide 2023-11-27 12:53:27 +01:00
parent 502e0c6185
commit c243404bba
1 changed files with 1 additions and 29 deletions

View File

@ -39,31 +39,7 @@
{ {
# Development environment output # Development environment output
devShells = forAllSystems ({ pkgs }: { devShells = forAllSystems ({ pkgs }: {
default = let default = pkgs.mkShell {
podmanSetupScript = let
registriesConf = pkgs.writeText "registries.conf" ''
[registries.search]
registries = ['docker.io']
[registries.block]
registries = []
'';
in pkgs.writeScript "podman-setup" ''
#!${pkgs.runtimeShell}
# Dont overwrite customised configuration
if ! test -f ~/.config/containers/policy.json; then
install -Dm555 ${pkgs.skopeo.src}/default-policy.json ~/.config/containers/policy.json
fi
if ! test -f ~/.config/containers/registries.conf; then
install -Dm555 ${registriesConf} ~/.config/containers/registries.conf
fi
'';
# Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "docker-podman-compat" {} ''
mkdir -p $out/bin
ln -s ${pkgs.podman}/bin/podman $out/bin/docker
'';
in pkgs.mkShell {
# The Nix packages provided in the environment # The Nix packages provided in the environment
packages = (with pkgs; [ packages = (with pkgs; [
# Fluff # Fluff
@ -90,9 +66,6 @@
# If on wayland # If on wayland
libxkbcommon libxkbcommon
wayland wayland
# Cross compilation
cargo-cross
podman # needed by cargo-cross
# Rust # Rust
rustup rustup
rustToolchain rustToolchain
@ -104,7 +77,6 @@
pkgs.udev pkgs.udev
pkgs.vulkan-loader pkgs.vulkan-loader
]}" ]}"
${podmanSetupScript}
# Aliases and other fluff/ease of use # Aliases and other fluff/ease of use
alias runIntel="nixVulkanIntel cargo run" alias runIntel="nixVulkanIntel cargo run"
alias runMommyIntel="nixVulkanIntel cargo mommy run" alias runMommyIntel="nixVulkanIntel cargo mommy run"