builds

jwiegley · Jan 20, 2024 · 1e7c1c1 · 1e7c1c1
1 parent b56af8a
commit 1e7c1c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/hlibgit2/configure b/hlibgit2/configure
@@ -1,11 +1,14 @@
 set -e
 
+rm -rf libgit2
 git clone https://github.com/libgit2/libgit2.git libgit2
 cd libgit2
 git checkout 45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5
 
 cmake . \
-  -D USE_NTLMCLIENT=OFF
+  -D USE_NTLMCLIENT=OFF \
+  -D BUILD_TESTS=OFF \
+  -D USE_HTTPS=system
 
 cd ..
 

diff --git a/hlibgit2/default.nix b/hlibgit2/default.nix
@@ -34,4 +34,4 @@ let
     '';
   };
 in
-  pkgs.haskellPackages.callCabal2nix "hlibgit2" hlibgit2-src {git = pkgs.git;}
+  pkgs.haskellPackages.callCabal2nix "hlibgit2" ./. {inherit (pkgs) git;}
diff --git a/hlibgit2/hlibgit2.cabal b/hlibgit2/hlibgit2.cabal
@@ -11,8 +11,8 @@ Build-Type:          Configure
 Category:            FFI
 
 extra-source-files:
-  libgit2/**/*.h
-  libgit2/**/*.c
+  --libgit2/**/*.h
+  --libgit2/**/*.c
   libgit2/COPYING
   configure
 
@@ -406,3 +406,4 @@ Library
         /usr/local/opt/openssl/lib
     extra-libraries:
       ssl, crypto, pthread, pcre
+      --, libgit2
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ let @@
         '';
       };
     in
-      pkgs.haskellPackages.callCabal2nix "hlibgit2" hlibgit2-src {git = pkgs.git;}
+      pkgs.haskellPackages.callCabal2nix "hlibgit2" ./. {inherit (pkgs) git;}