From c46a51df5d5b064ed41876e0a87270052f8baa7d Mon Sep 17 00:00:00 2001
From: Alex Kwiatkowski <alex+git@fremantle.io>
Date: Tue, 22 Aug 2023 21:31:14 -0700
Subject: [PATCH] fix nix build on osx

---
 flake.lock | 12 ++++++------
 flake.nix  | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 980bc5e..5e54bcb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689444953,
-        "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
+        "lastModified": 1692638711,
+        "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8acef304efe70152463a6399f73e636bcc363813",
+        "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1689550386,
-        "narHash": "sha256-YLbm7bt2mUeYoYCyTBhvjHmO+W+MT+GzCBP+vZA6d00=",
+        "lastModified": 1692763353,
+        "narHash": "sha256-anNyTyQYt1zYcKwSv9l9kEmBG2DPttwBn2poflh/ODg=",
         "owner": "rupurt",
         "repo": "odbc-drivers-nix",
-        "rev": "85f352b51bbaaa0376333f5449b27f41ee7b8150",
+        "rev": "dde876cbc79c1c6a8a11c33e3b1e43b09e9abed5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 27ee8f8..567ee63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,16 +28,10 @@
           ];
         };
       stdenv = pkgs.llvmPackages_15.stdenv;
-
-      # Define a helper function to conditionally include the db2-odbc-driver package as not all arch are supported
-      getDb2OdbcDriver =
-      if system == "aarch64-linux" || system == "aarch64-darwin" then null else pkgs.db2-odbc-driver {};
-
-
     in rec {
       # packages exported by the flake
       packages = {
-        db2-odbc-driver = getDb2OdbcDriver;
+        db2-odbc-driver = pkgs.db2-odbc-driver {};
         postgres-odbc-driver = pkgs.postgres-odbc-driver {};
       };
 
@@ -65,7 +59,11 @@
         generate-odbcinst-ini = {
           type = "app";
           program = toString (pkgs.writeScript "generate-odbcinst-ini" ''
-            DB2_DRIVER_PATH=${packages.db2-odbc-driver}/lib/${if stdenv.isDarwin then "libdb2.dylib" else "libdb2.so"} \
+            DB2_DRIVER_PATH=${packages.db2-odbc-driver}/lib/${
+              if stdenv.isDarwin
+              then "libdb2.dylib"
+              else "libdb2.so"
+            } \
             POSTGRES_DRIVER_PATH=${packages.postgres-odbc-driver}/lib/psqlodbca.so \
               envsubst < ./templates/.odbcinst.ini.template > .odbcinst.ini
           '');
@@ -73,7 +71,11 @@
         ls-odbc-driver-paths = {
           type = "app";
           program = toString (pkgs.writeScript "ls-odbc-driver-paths" ''
-            echo "db2 ${packages.db2-odbc-driver}/lib/${if stdenv.isDarwin then "libdb2.dylib" else "libdb2.so"}"
+            echo "db2 ${packages.db2-odbc-driver}/lib/${
+              if stdenv.isDarwin
+              then "libdb2.dylib"
+              else "libdb2.so"
+            }"
             echo "postgres ${packages.postgres-odbc-driver}/lib/psqlodbca.so"
           '');
         };