diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/easyloggingpp | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/easyloggingpp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix index 29fdd0689593..ad582d933059 100644 --- a/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,22 +1,22 @@ # To use this package with a CMake and pkg-config build: # pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) # add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ stdenv, fetchFromGitHub, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "easyloggingpp"; - version = "9.96.7"; + version = "9.97.0"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz"; + sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; }; nativeBuildInputs = [cmake]; buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + - stdenv.lib.optionalString stdenv.isLinux " -pthread"; + lib.optionalString stdenv.isLinux " -pthread"; postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ logging library"; homepage = "https://muflihun.github.io/easyloggingpp/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [acowley]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [acowley]; + platforms = lib.platforms.all; }; } |