From 33bcb883bf64f92dc10588e2a6e1f8a433d17759 Mon Sep 17 00:00:00 2001
From: Solene Rapenne <solene@perso.pw>
Date: Thu, 1 Sep 2022 09:22:23 +0200
Subject: [PATCH] nix-instantiate can be used to replace nix-instantiate +
 nix-build

---
 mirror.pl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/mirror.pl b/mirror.pl
index 16a25eb..93cd5c4 100755
--- a/mirror.pl
+++ b/mirror.pl
@@ -14,20 +14,17 @@ my $return;
 foreach my $val (@data) {
     if ( ! -f "distfiles/$val->{name}" ) {
         #print "Fetching $val->{name} from $val->{url} with patch=$val->{isPatch} $val->{type} $val->{hash}\n";
-        print Dumper $val;
-        if ($val->{isPatch} eq 1) {
-            $return = `nix-instantiate '<nixpkgs>' -A fetchpatch --argstr url "$val->{url}" --argstr name "$val->{name}" --argstr sha256 "$val->{hash}"`;
-            $return = `nix-build -o "distfiles/$val->{name}" $return`;
+        #print Dumper $val;
+        if (defined $val->{isPatch} && $val->{isPatch} eq 1) {
+            $return = `nix-build -o "distfiles/$val->{name}" '<nixpkgs>' -A fetchpatch --argstr url "$val->{url}" --argstr name "$val->{name}" --argstr sha256 "$val->{hash}"`;
             print $return;
         } else {
             # we known the checksum we expect
             if (defined $val->{type}) {
-                $return = `nix-instantiate '<nixpkgs>' -A fetchurl --argstr url "$val->{url}" --argstr "$val->{type}" "$val->{hash}"`;
-                $return = `nix-build -o "distfiles/$val->{name}" $return`;
+                $return = `nix-build -o "distfiles/$val->{name}" '<nixpkgs>' -A fetchurl --argstr url "$val->{url}" --argstr "$val->{type}" "$val->{hash}"`;
                 print $return;
             } else {
-                $return = `nix-instantiate '<nixpkgs>' -A fetchurl --argstr url "$val->{url}" --argstr sha256 "$val->{hash}"`;
-                $return = `nix-build -o "distfiles/$val->{name}" $return`;
+                $return = `nix-build -o "distfiles/$val->{name}" '<nixpkgs>' -A fetchurl --argstr url "$val->{url}" --argstr sha256 "$val->{hash}"`;
                 print $return;
             }
         }