From e0a5689528fe58e8244331ad5d46c1b9344605ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:55:26 +0000
Subject: [PATCH 1/2] defaultCrateOverrides: order alphabetically

---
 .../rust/default-crate-overrides.nix          | 75 ++++++++++++-------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d93e0a5f56df..516bf456667d 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -6,76 +6,93 @@ let
   inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
 in
 {
+  cairo-rs = attrs: {
+    buildInputs = [ cairo ];
+  };
+
   cargo = attrs: {
     buildInputs = [ openssl zlib curl ]
       ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
     # TODO: buildRustCrate seems to use incorrect default inference
     crateBin = [ {  name = "cargo"; path = "src/bin/cargo.rs"; } ];
   };
+
   cargo-vendor = attrs: {
     buildInputs = [ openssl zlib curl ];
     # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
     # be considered a cargo subcommand.
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
+
   curl-sys = attrs: {
     buildInputs = [ pkgconfig zlib curl ];
     propagatedBuildInputs = [ curl zlib ];
     extraLinkFlags = ["-L${zlib.out}/lib"];
   };
-  libgit2-sys = attrs: {
-    LIBGIT2_SYS_USE_PKG_CONFIG = true;
-    buildInputs = [ pkgconfig openssl zlib libgit2 ];
-  };
-  libsqlite3-sys = attrs: {
-    buildInputs = [ pkgconfig sqlite ];
-  };
-  libssh2-sys = attrs: {
-    buildInputs = [ pkgconfig openssl zlib libssh2 ];
-  };
-  openssl = attrs: {
-    buildInputs = [ openssl ];
-  };
-  openssl-sys = attrs: {
-    buildInputs = [ pkgconfig openssl ];
-  };
 
   dbus = attrs: {
     buildInputs = [ pkgconfig dbus ];
   };
-  libdbus-sys = attrs: {
-    buildInputs = [ pkgconfig dbus ];
-  };
+
   gobject-sys = attrs: {
     buildInputs = [ dbus-glib ];
   };
+
   gio-sys = attrs: {
     buildInputs = [ dbus-glib ];
   };
+
   gdk-pixbuf-sys = attrs: {
     buildInputs = [ dbus-glib ];
   };
+
   gdk-pixbuf = attrs: {
     buildInputs = [ gdk_pixbuf ];
   };
+
+  libgit2-sys = attrs: {
+    LIBGIT2_SYS_USE_PKG_CONFIG = true;
+    buildInputs = [ pkgconfig openssl zlib libgit2 ];
+  };
+
+  libsqlite3-sys = attrs: {
+    buildInputs = [ pkgconfig sqlite ];
+  };
+
+  libssh2-sys = attrs: {
+    buildInputs = [ pkgconfig openssl zlib libssh2 ];
+  };
+
+  libdbus-sys = attrs: {
+    buildInputs = [ pkgconfig dbus ];
+  };
+
+  openssl = attrs: {
+    buildInputs = [ openssl ];
+  };
+
+  openssl-sys = attrs: {
+    buildInputs = [ pkgconfig openssl ];
+  };
+
+  pq-sys = attr: {
+    buildInputs = [ pkgconfig postgresql ];
+  };
+
   rink = attrs: {
     buildInputs = [ gmp ];
     crateBin = [ {  name = "rink"; path = "src/bin/rink.rs"; } ];
   };
-  cairo-rs = attrs: {
-    buildInputs = [ cairo ];
-  };
-  xcb = attrs: {
-    buildInputs = [ python3 ];
+
+  security-framework-sys = attr: {
+    propagatedBuildInputs = [ Security ];
   };
 
   thrussh-libsodium = attrs: {
     buildInputs = [ pkgconfig libsodium ];
   };
-  pq-sys = attr: {
-    buildInputs = [ pkgconfig postgresql ];
-  };
-  security-framework-sys = attr: {
-    propagatedBuildInputs = [ Security ];
+
+  xcb = attrs: {
+    buildInputs = [ python3 ];
   };
 }

From 96c627b3f60c79f5fd756db5c9978ec918a54a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:56:30 +0000
Subject: [PATCH 2/2] defaultCrateOverrides: add serde_derive

---
 pkgs/build-support/rust/default-crate-overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 516bf456667d..da3f0a59eb60 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -88,6 +88,10 @@ in
     propagatedBuildInputs = [ Security ];
   };
 
+  serde_derive = attrs: {
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  };
+
   thrussh-libsodium = attrs: {
     buildInputs = [ pkgconfig libsodium ];
   };