pyrox.dev
lib2geom: update 2020-03-12 -> 1.1
Reworks:
* lgpl21 => lgpl21Only (jtojnar)
* stdenv.lib => lib (jtojnar)
* Use 1.1 tagged version rather than sha1 from inkscape 1.1 (jtojnar)
* BUILD_SHARED_LIBS => 2GEOM_BUILD_SHARED (jtojnar)
* Drop cmakeBuildType (jtojnar)
+8
-20
pkgs/development/libraries/lib2geom/default.nix
+8
-20
pkgs/development/libraries/lib2geom/default.nix
···
1
1
{ stdenv
2
2
, fetchFromGitLab
3
-
, fetchpatch
4
3
, cmake
5
4
, ninja
6
5
, pkg-config
···
10
9
, cairo
11
10
, double-conversion
12
11
, gtest
12
+
, lib
13
13
}:
14
14
15
15
stdenv.mkDerivation rec {
16
-
pname = "lib2geom-unstable";
17
-
version = "2020-03-12";
16
+
pname = "lib2geom";
17
+
version = "1.1";
18
18
19
19
outputs = [ "out" "dev" ];
20
20
21
21
src = fetchFromGitLab {
22
22
owner = "inkscape";
23
23
repo = "lib2geom";
24
-
rev = "226eb8c60f2af639d74a0229c0ba90e649e6451d";
25
-
sha256 = "BSuqasBfig6HiKY/xtJm7CjbSaV8cW45ip59iEO5Es4=";
24
+
rev = "refs/tags/${version}";
25
+
sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0=";
26
26
};
27
27
28
-
patches = [
29
-
# Re-enable assertions for tests to work
30
-
# https://gitlab.com/inkscape/lib2geom/issues/5
31
-
# https://gitlab.com/inkscape/lib2geom/merge_requests/17
32
-
(fetchpatch {
33
-
url = "https://gitlab.com/inkscape/lib2geom/commit/4aa78f52232682b353eb15c219171e466987bac7.patch";
34
-
sha256 = "XsX8SPft0RwDemJujc8lierBe4s3iw8YkW4CSlY5LsY=";
35
-
})
36
-
];
37
-
38
28
nativeBuildInputs = [
39
29
cmake
40
30
ninja
···
53
43
gtest
54
44
];
55
45
56
-
cmakeBuildType = "RelWithDebugInfo"; # needed to keep assertions for tests working
57
-
58
46
cmakeFlags = [
59
47
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
60
-
"-DBUILD_SHARED_LIBS=ON"
48
+
"-D2GEOM_BUILD_SHARED=ON"
61
49
];
62
50
63
51
doCheck = true;
64
52
65
-
meta = with stdenv.lib; {
53
+
meta = with lib; {
66
54
description = "Easy to use 2D geometry library in C++";
67
55
homepage = "https://gitlab.com/inkscape/lib2geom";
68
-
license = [ licenses.lgpl21 licenses.mpl11 ];
56
+
license = [ licenses.lgpl21Only licenses.mpl11 ];
69
57
maintainers = with maintainers; [ jtojnar ];
70
58
platforms = platforms.unix;
71
59
};