about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-25 14:54:59 +0200
committeraszlig <aszlig@nix.build>2018-04-25 15:01:38 +0200
commitac61ae50b7b47dfae92ff921dab0774554e7df9e (patch)
tree24c04d5cb415ad4d60b011f03f2553ab23a3df4b
parentca7d98399976be0dd562d1f8ecd62ed3e5cd5656 (diff)
downloadnixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar.gz
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar.bz2
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar.lz
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar.xz
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.tar.zst
nixlib-ac61ae50b7b47dfae92ff921dab0774554e7df9e.zip
gn: Switch to fetchzip for apple_apsl directory
The tarball from upstream seems to be generated on the fly, so the
output is not deterministic and using fetchzip makes this more reliable
as we have a recursively hashed output path without any of the
non-determinisms in tarballs.

Unfortunately, the build still fails on NixOS systems, because we need a
few more stuff in the build tree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
-rw-r--r--pkgs/development/tools/build-managers/gn/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index bfbb2b4e3308..a9930d258c2c 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchurl, fetchpatch
+{ stdenv, lib, fetchgit, fetchzip, fetchpatch
 , libevent, ninja, python, darwin }:
 
 let
@@ -28,9 +28,10 @@ let
       rev = "585ec31ea716f08233a815e680fc0d4699843938";
       sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
     };
-    "third_party/apple_apsl" = fetchurl {
+    "third_party/apple_apsl" = fetchzip {
       url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
-      sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k";
+      sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
+      stripRoot = false;
     };
   };