diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/leveldb | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/leveldb')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/leveldb/default.nix | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix index 2a7fb196ea68..c29a32327278 100644 --- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -1,39 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, snappy, cmake +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "leveldb"; - version = "1.20"; + version = "1.23"; src = fetchFromGitHub { owner = "google"; repo = "leveldb"; - rev = "v${version}"; - sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y"; + rev = "${version}"; + sha256 = "sha256-RL+dfSFZZzWvUobSqiPbuC4nDiGzjIIukbVJZRacHbI="; }; + patches = [ + # Re-enable RTTI. Needed for e.g. Ceph to compile properly. + # See https://github.com/NixOS/nixpkgs/issues/147801, + # https://github.com/google/leveldb/issues/731, + # https://lists.ceph.io/hyperkitty/list/dev@ceph.io/thread/K4OSAA4AJS2V7FQI6GNCKCK3IRQDBQRS/. + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/leveldb/raw/e8178670c664e952fdd00f1fc6e3eb28b2c5b6a8/f/0006-revert-no-rtti.patch"; + sha256 = "sha256-d2YAV8O+1VKu3WwgNsWw6Cxg5sUUR+xOlJtA7pTcigQ="; + }) + ]; + + outputs = [ "out" "dev" ]; + buildInputs = [ snappy ]; - nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames ++ [ cmake ]; doCheck = true; buildFlags = [ "all" ]; + # NOTE: disabling tests due to gtest issue + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DLEVELDB_BUILD_TESTS=OFF" + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' # remove shared objects from "all" target sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile ''; - installPhase = '' - runHook preInstall - - install -D -t $out/include/leveldb include/leveldb/* - install -D helpers/memenv/memenv.h $out/include/leveldb/helpers - - install -D -t $out/lib out-{static,shared}/lib* - install -D -t $out/bin out-static/{leveldbutil,db_bench} - - runHook postInstall + postInstall = '' + substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"' + mkdir -p $dev/lib/pkgconfig + cat <<EOF > $dev/lib/pkgconfig/leveldb.pc + Name: leveldb + Description: Fast and lightweight key/value database library by Google. + Version: ${version} + Libs: -L$out/lib -lleveldb + Cflags: -I$dev/include + EOF ''; meta = with lib; { |