tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
libgeneral: init at 84
Jonas Heinrich
5 months ago
be94d3f8
42b7c0db
+70
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
li
libgeneral
configure-version.patch
package.nix
+26
pkgs/by-name/li/libgeneral/configure-version.patch
···
1
1
+
diff --git a/configure.ac b/configure.ac
2
2
+
index c214ccd..ab0cdd7 100644
3
3
+
--- a/configure.ac
4
4
+
+++ b/configure.ac
5
5
+
@@ -1,5 +1,5 @@
6
6
+
AC_PREREQ([2.69])
7
7
+
-AC_INIT([libgeneral], m4_esyscmd([git rev-list --count HEAD | tr -d '\n']), [tihmstar@gmail.com])
8
8
+
+AC_INIT([libgeneral], [tihmstar@gmail.com])
9
9
+
10
10
+
AC_CANONICAL_SYSTEM
11
11
+
AC_CANONICAL_HOST
12
12
+
@@ -9,10 +9,10 @@ AM_INIT_AUTOMAKE([subdir-objects])
13
13
+
AC_CONFIG_HEADERS([config.h])
14
14
+
AC_CONFIG_MACRO_DIRS([m4])
15
15
+
16
16
+
-AC_DEFINE([VERSION_COMMIT_COUNT], "m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])", [Git commit count])
17
17
+
-AC_DEFINE([VERSION_COMMIT_SHA], "m4_esyscmd([git rev-parse HEAD | tr -d '\n'])", [Git commit sha])
18
18
+
-AC_SUBST([VERSION_COMMIT_COUNT], ["m4_esyscmd([git rev-list --count HEAD | tr -d '\n'])"])
19
19
+
-AC_SUBST([VERSION_COMMIT_SHA], ["m4_esyscmd([git rev-parse HEAD | tr -d '\n'])"])
20
20
+
+AC_ARG_WITH([version-commit-count], [],
21
21
+
+ [VERSION_COMMIT_COUNT="$withval"])
22
22
+
+AC_DEFINE([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"], [Git commit count])
23
23
+
+AC_SUBST([VERSION_COMMIT_COUNT], ["$VERSION_COMMIT_COUNT"])
24
24
+
25
25
+
# Checks for programs.
26
26
+
AC_PROG_CXX([clang++])
+44
pkgs/by-name/li/libgeneral/package.nix
···
1
1
+
{
2
2
+
lib,
3
3
+
clangStdenv,
4
4
+
fetchFromGitHub,
5
5
+
autoreconfHook,
6
6
+
pkg-config,
7
7
+
libimobiledevice,
8
8
+
libusb1,
9
9
+
avahi,
10
10
+
}:
11
11
+
clangStdenv.mkDerivation (finalAttrs: {
12
12
+
pname = "libgeneral";
13
13
+
version = "84";
14
14
+
15
15
+
src = fetchFromGitHub {
16
16
+
owner = "tihmstar";
17
17
+
repo = "libgeneral";
18
18
+
tag = finalAttrs.version;
19
19
+
hash = "sha256-D6S7Ha7SQvWDGwiJuKh2Y9YOsw2ytxn70ia3llKC034=";
20
20
+
};
21
21
+
22
22
+
# Do not depend on git to calculate version, instead
23
23
+
# pass version via configureFlag
24
24
+
patches = [ ./configure-version.patch ];
25
25
+
26
26
+
nativeBuildInputs = [
27
27
+
autoreconfHook
28
28
+
pkg-config
29
29
+
];
30
30
+
31
31
+
configureFlags = [
32
32
+
"--with-version-commit-count=${finalAttrs.version}"
33
33
+
];
34
34
+
35
35
+
strictDeps = true;
36
36
+
37
37
+
meta = {
38
38
+
description = "Helper library used by usbmuxd2";
39
39
+
homepage = "https://github.com/tihmstar/libgeneral";
40
40
+
license = lib.licenses.lgpl21;
41
41
+
platforms = lib.platforms.all;
42
42
+
maintainers = with lib.maintainers; [ onny ];
43
43
+
};
44
44
+
})