From f1ee26bc4b7823c7d138285ae34b697e78b27a20 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 14 Nov 2018 14:30:24 +0100
Subject: [PATCH 1/2] rust-cbindgen: 0.6.3 -> 0.6.7

---
 pkgs/development/tools/rust/cbindgen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 970ace229e20..6b14f49716f2 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-cbindgen-${version}";
-  version = "0.6.3";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "eqrion";
     repo = "cbindgen";
     rev = "v${version}";
-    sha256 = "18lvvzksc7gfx8fffpil41phjzwdc67xfh0mijkkv4zchwlqkpq2";
+    sha256 = "0sgkgvkqrc6l46fvk6d9hsy0xrjpl2ix47f3cv5bi74dv8i4y2b4";
   };
 
-  cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9";
+  cargoSha256 = "137dqj1sp02dh0dz9psf8i8q57gmz3rfgmwk073k7x5zzkgvj21c";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 66e16843b35ecc56de7badad279a1d0264832025 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 14 Nov 2018 20:51:19 +0100
Subject: [PATCH 2/2] firefox: apply patch for newer rust-cbindgen

rust-cbindgen did apply some breaking changes which requires the added
patch in order to compile until a firefox version with the fix gets
released. Firefox 63.0.3 is supposed to carry the required patches. This
should only be required for a short term.
---
 .../applications/networking/browsers/firefox/packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 81f805feddff..f8c1c0837553 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -22,6 +22,14 @@ rec {
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
+      # this is only required for version 63.0,  version 63.0.3 onwards will
+      # carry the patch
+      # bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1503401
+      (fetchpatch {
+        name = "fix-rust-cbindgen-breaking-change.patch";
+        url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/22273af49058";
+        sha256 = "1kvswbr1jxigli6s5jh3cr21153jx6mlyxf4a39510y3dg19ls0a";
+      })
     ];
 
     extraNativeBuildInputs = [ python3 ];