From 0935f7d7dd551a51cb64a30a0c26c25fa4b4d024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 15 May 2021 13:27:34 +0200
Subject: [PATCH] neovide: Separate skia externals

---
 .../editors/neovim/neovide/default.nix        | 38 +------------------
 .../neovim/neovide/skia-externals.json        | 37 ++++++++++++++++++
 2 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/applications/editors/neovim/neovide/skia-externals.json

diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix
index 7942d01f91ce..b4c12304a9d4 100644
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@@ -54,43 +54,7 @@ rustPlatform.buildRustPackage rec {
         sha256 = "sha256-uTSgtiEkbE9e08zYOkRZyiHkwOLr/FbBYkr2d+NZ8J0=";
       };
       # The externals for skia are taken from skia/DEPS
-      externals = {
-        expat = fetchgit {
-          url = "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git";
-          rev = "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb";
-          sha256 = "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI=";
-        };
-        libjpeg-turbo = fetchgit {
-          url = "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git";
-          rev = "64fc43d52351ed52143208ce6a656c03db56462b";
-          sha256 = "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig=";
-        };
-        icu = fetchgit {
-          url = "https://chromium.googlesource.com/chromium/deps/icu.git";
-          rev = "dbd3825b31041d782c5b504c59dcfb5ac7dda08c";
-          sha256 = "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE=";
-        };
-        zlib = fetchgit {
-          url = "https://chromium.googlesource.com/chromium/src/third_party/zlib";
-          rev = "eaf99a4e2009b0e5759e6070ad1760ac1dd75461";
-          sha256 = "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE=";
-        };
-        harfbuzz = fetchgit {
-          url = "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git";
-          rev = "3a74ee528255cc027d84b204a87b5c25e47bff79";
-          sha256 = "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM=";
-        };
-        libpng = fetchgit {
-          url = "https://skia.googlesource.com/third_party/libpng.git";
-          rev = "386707c6d19b974ca2e3db7f5c61873813c6fe44";
-          sha256 = "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=";
-        };
-        libgifcodec = fetchgit {
-          url = "https://skia.googlesource.com/libgifcodec";
-          rev = "d06d2a6d42baf6c0c91cacc28df2542a911d05fe";
-          sha256 = "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI=";
-        };
-      };
+      externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json);
     in
     runCommand "source" { } (''
       cp -R ${repo} $out
diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json
new file mode 100644
index 000000000000..be1fdb181c2c
--- /dev/null
+++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json
@@ -0,0 +1,37 @@
+{
+  "expat": {
+    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
+    "rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb",
+    "sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI="
+  },
+  "libjpeg-turbo": {
+    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
+    "rev": "64fc43d52351ed52143208ce6a656c03db56462b",
+    "sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig="
+  },
+  "icu": {
+    "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
+    "rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c",
+    "sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE="
+  },
+  "zlib": {
+    "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
+    "rev": "eaf99a4e2009b0e5759e6070ad1760ac1dd75461",
+    "sha256": "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE="
+  },
+  "harfbuzz": {
+    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
+    "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79",
+    "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM="
+  },
+  "libpng": {
+    "url": "https://skia.googlesource.com/third_party/libpng.git",
+    "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44",
+    "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c="
+  },
+  "libgifcodec": {
+    "url": "https://skia.googlesource.com/libgifcodec",
+    "rev": "d06d2a6d42baf6c0c91cacc28df2542a911d05fe",
+    "sha256": "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI="
+  }
+}