about summary refs log tree commit diff
path: root/nix
diff options
context:
space:
mode:
authoredef <edef@mutable.io>2020-08-04T15·06+0000
committeredef <edef@edef.eu>2020-08-04T22·51+0000
commitee627e07f1ea875ab5c1c55ebb4ed5ec5747b8a8 (patch)
treea88e6fb19f6c4f6ffa7d546fd180ee9828e1002a /nix
parent5feed69260d966d2b38050160ccdcd794d8e6c75 (diff)
chore(nix/fetchGoModule): remove overrideAttrs hack r/1584
This was based off fetchzip, but unlike fetchzip we don't need to
support arbitrary archive formats, so we don't actually need the unpack
hooks.

Change-Id: I5655c031f420422f13e72bb79f4b4b95f6f1204e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1640
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'nix')
-rw-r--r--nix/fetchGoModule/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/nix/fetchGoModule/default.nix b/nix/fetchGoModule/default.nix
index 3f0784ad8fe7..4f0cdb4b78cb 100644
--- a/nix/fetchGoModule/default.nix
+++ b/nix/fetchGoModule/default.nix
@@ -14,7 +14,7 @@ in
 
 { path, version, sha256 }:
 
-(pkgs.fetchurl {
+pkgs.fetchurl {
   name = "source";
   url = "https://proxy.golang.org/${caseFold path}/@v/v${version}.zip";
   inherit sha256;
@@ -28,9 +28,7 @@ in
     cd "$unpackDir"
 
     mv "$downloadedFile" "$TMPDIR/src.zip"
-    unpackFile "$TMPDIR/src.zip"
+    ${pkgs.unzip}/bin/unzip "$TMPDIR/src.zip" -d "$unpackDir"
     mv "$unpackDir/${path}@v${version}" "$out"
   '';
-}).overrideAttrs ({ nativeBuildInputs ? [], ... }: {
-  nativeBuildInputs = nativeBuildInputs ++ [ pkgs.unzip ];
-})
+}