From 44b77bf3403f9663c9cb051165ab69c302b1d081 Mon Sep 17 00:00:00 2001
From: Knarkzel <knarkzel@gmail.com>
Date: Tue, 15 Nov 2022 16:47:28 +0100
Subject: [PATCH] Yet another refactor

---
 devkitppc.nix      | 8 ++------
 extract-docker.nix | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/devkitppc.nix b/devkitppc.nix
index dc0c884..6c6c3ec 100644
--- a/devkitppc.nix
+++ b/devkitppc.nix
@@ -1,6 +1,6 @@
 let
   pkgs = import <nixpkgs> {};
-  devkitppc-img = pkgs.dockerTools.pullImage {
+  image = pkgs.dockerTools.pullImage {
     imageName = "devkitpro/devkitppc";
     imageDigest = "sha256:d88e21c1a7b5f8070ba7a15aa892e395f118ded9803b0f8223a3d29ba279fff3";
     sha256 = "nVtz/9mbYveKbvTMj/39EzND7qiLkjBHfqSOgT6SBUY=";
@@ -10,11 +10,7 @@ let
 in {
   devkitppc = pkgs.stdenv.mkDerivation {
     name = "devkitppc";
-    src = import ./extract-docker.nix {
-      pkgs = pkgs;
-      image = devkitppc-img;
-      directory = "/opt/devkitpro";
-    };
+    src = import ./extract-docker.nix pkgs image "/opt/devkitpro";
     nativeBuildInputs = [
       pkgs.autoPatchelfHook
     ];
diff --git a/extract-docker.nix b/extract-docker.nix
index 174a1fb..1388614 100644
--- a/extract-docker.nix
+++ b/extract-docker.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  image,
-  directory,
-}:
+pkgs: image: directory:
 pkgs.vmTools.runInLinuxVM (
   pkgs.runCommand "docker-preload-image" {
     memSize = 8 * 1024;