Skip to content

Commit 1e7c1c1

Browse files
committed
builds
1 parent b56af8a commit 1e7c1c1

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

hlibgit2/configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
set -e
22

3+
rm -rf libgit2
34
git clone https://github.com/libgit2/libgit2.git libgit2
45
cd libgit2
56
git checkout 45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5
67

78
cmake . \
8-
-D USE_NTLMCLIENT=OFF
9+
-D USE_NTLMCLIENT=OFF \
10+
-D BUILD_TESTS=OFF \
11+
-D USE_HTTPS=system
912

1013
cd ..
1114

hlibgit2/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ let
3434
'';
3535
};
3636
in
37-
pkgs.haskellPackages.callCabal2nix "hlibgit2" hlibgit2-src {git = pkgs.git;}
37+
pkgs.haskellPackages.callCabal2nix "hlibgit2" ./. {inherit (pkgs) git;}

hlibgit2/hlibgit2.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Build-Type: Configure
1111
Category: FFI
1212

1313
extra-source-files:
14-
libgit2/**/*.h
15-
libgit2/**/*.c
14+
--libgit2/**/*.h
15+
--libgit2/**/*.c
1616
libgit2/COPYING
1717
configure
1818

@@ -406,3 +406,4 @@ Library
406406
/usr/local/opt/openssl/lib
407407
extra-libraries:
408408
ssl, crypto, pthread, pcre
409+
--, libgit2

0 commit comments

Comments
 (0)