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