From f6a94756cb6bd48edf29ed6d146b2335144ef81d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 4 Dec 2018 21:35:33 +0100
Subject: [PATCH] add back Security on darwin and cleanup expression

---
 default.nix | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/default.nix b/default.nix
index 8941f5a..30930bc 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,21 @@
-{ pkgs ? import ./nix {}
-}:
+{ pkgs ? import ./nix {} }:
+
 let
+  ofborgOverrides = {
+    crateOverrides = pkgs.defaultCrateOverrides // {
+      ofborg = attrs: {
+        buildInputs = pkgs.lib.optional pkgs.stdenv.isDarwin
+          pkgs.darwin.apple_sdk.frameworks.Security;
+      };
+    };
+  };
+
+  drv = (pkgs.callPackage ./ofborg/Cargo.nix {
+    cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {};
+  }).ofborg {};
+
+  src = stripDeps (drv.override ofborgOverrides);
+
   stripDeps = pkg: pkgs.runCommand "${pkg.name}-deps-stripped" {}
   ''
     cp -r ${pkg} $out
@@ -9,14 +24,10 @@ let
     find $out/bin -name '*.d' -delete
     chmod -R a-w $out
   '';
-in {
-  ofborg.rs = let
-    drv = (pkgs.callPackage ./ofborg/Cargo.nix {
-      cratesIO = pkgs.callPackage ./ofborg/crates-io.nix {};
-    }).ofborg {};
-  in pkgs.runCommand "ofborg-rs-symlink-compat" {
-    src = stripDeps drv;
-  } ''
+in
+
+{
+  ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { inherit src; } ''
     mkdir -p $out/bin
     for f in $(find $src -type f); do
       bn=$(basename "$f")
@@ -44,21 +55,21 @@ in {
 
 
 
-Build failed because you bumped the Cargo
-version without regenerating the carnix
-file.
+    Build failed because you bumped the Cargo
+    version without regenerating the carnix
+    file.
 
-Run:
+    Run:
 
 
 
-    nix-shell --run ./nix/update-carnix.sh
+        nix-shell --run ./nix/update-carnix.sh
 
 
-and commit those changes.
+    and commit those changes.
 
 
-EOF
+    EOF
     fi
   '';