Skip to content

Commit 9941229

Browse files
committed
bear: use lib.cmakeFeature, drop with lib
1 parent 542b211 commit 9941229

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkgs/by-name/be/bear/package.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
7474
cmakeFlags = [
7575
# Build system and generated files concatenate install prefix and
7676
# CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths.
77-
"-DCMAKE_INSTALL_BINDIR=bin"
78-
"-DCMAKE_INSTALL_LIBDIR=lib"
77+
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
78+
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
7979
(lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
8080
(lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.finalPackage.doCheck)
8181
];
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
110110
# Functional tests use loopback networking.
111111
__darwinAllowLocalNetworking = true;
112112

113-
meta = with lib; {
113+
meta = {
114114
description = "Tool that generates a compilation database for clang tooling";
115115
mainProgram = "bear";
116116
longDescription = ''
@@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
119119
and run `bear make`. It's not perfect, but it gets a long way.
120120
'';
121121
homepage = "https://github.com/rizsotto/Bear";
122-
license = licenses.gpl3Plus;
123-
platforms = platforms.unix;
124-
maintainers = with maintainers; [ DieracDelta ];
122+
license = lib.licenses.gpl3Plus;
123+
platforms = lib.platforms.unix;
124+
maintainers = with lib.maintainers; [ DieracDelta ];
125125
};
126126
})

0 commit comments

Comments
 (0)