Browse Source

Yet another refactor

master
Knarkzel 2 years ago
parent
commit
44b77bf340
  1. 8
      devkitppc.nix
  2. 6
      extract-docker.nix

8
devkitppc.nix

@ -1,6 +1,6 @@
let let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
devkitppc-img = pkgs.dockerTools.pullImage { image = pkgs.dockerTools.pullImage {
imageName = "devkitpro/devkitppc"; imageName = "devkitpro/devkitppc";
imageDigest = "sha256:d88e21c1a7b5f8070ba7a15aa892e395f118ded9803b0f8223a3d29ba279fff3"; imageDigest = "sha256:d88e21c1a7b5f8070ba7a15aa892e395f118ded9803b0f8223a3d29ba279fff3";
sha256 = "nVtz/9mbYveKbvTMj/39EzND7qiLkjBHfqSOgT6SBUY="; sha256 = "nVtz/9mbYveKbvTMj/39EzND7qiLkjBHfqSOgT6SBUY=";
@ -10,11 +10,7 @@ let
in { in {
devkitppc = pkgs.stdenv.mkDerivation { devkitppc = pkgs.stdenv.mkDerivation {
name = "devkitppc"; name = "devkitppc";
src = import ./extract-docker.nix { src = import ./extract-docker.nix pkgs image "/opt/devkitpro";
pkgs = pkgs;
image = devkitppc-img;
directory = "/opt/devkitpro";
};
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.autoPatchelfHook pkgs.autoPatchelfHook
]; ];

6
extract-docker.nix

@ -1,8 +1,4 @@
{ pkgs: image: directory:
pkgs,
image,
directory,
}:
pkgs.vmTools.runInLinuxVM ( pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "docker-preload-image" { pkgs.runCommand "docker-preload-image" {
memSize = 8 * 1024; memSize = 8 * 1024;

Loading…
Cancel
Save