Commit 794e01a0 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

python3.pkgs.glean-sdk: unvendor lmdb

parent caa0a24a

pkgs/development/libraries/lmdb/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec { 
    Cflags: -I$dev/include

    Libs: -L$out/lib -llmdb

    EOF



    # Expected by Rust libraries.

    ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc"

  '';



  meta = with lib; {

pkgs/development/python-modules/glean-sdk/default.nix

+12 −0
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ 
, fetchPypi

, glean-parser

, iso8601

, lmdb

, pkg-config

, pytest-localserver

, pytestCheckHook

, python

, pythonOlder

, rustc

, rustPlatform
@@ -34,11 +37,16 @@ buildPythonPackage rec { 


  nativeBuildInputs = [

    cargo

    pkg-config

    rustc

    rustPlatform.cargoSetupHook

    setuptools-rust

  ];



  buildInputs = [

    lmdb

  ];



  propagatedBuildInputs = [

    cffi

    glean-parser
@@ -57,6 +65,10 @@ buildPythonPackage rec { 
    "test_flipping_upload_enabled_respects_order_of_events"

  ];



  postInstallCheck = lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf) ''

    readelf -a $out/${python.sitePackages}/glean/libglean_ffi.so | grep -F 'Shared library: [liblmdb.so'

  '';



  pythonImportsCheck = [

    "glean"

  ];

pkgs/top-level/python-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -4090,7 +4090,9 @@ self: super: with self; { 


  glean-parser = callPackage ../development/python-modules/glean-parser { };



  glean-sdk = callPackage ../development/python-modules/glean-sdk { };

  glean-sdk = callPackage ../development/python-modules/glean-sdk {

    inherit (pkgs) lmdb;

  };



  glfw = callPackage ../development/python-modules/glfw { };