Unverified Commit f7947266 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234465 from wegank/influxdb-refactor 

influxdb, influxdb2: migrate to bindgenHook
parents 7083969a 2e290f56

pkgs/servers/nosql/influxdb/default.nix

+2 −3
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, llvmPackages, libiconv, fetchpatch, nixosTests }:

{ lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }:



let

  libflux_version = "0.170.1";
@@ -25,9 +25,8 @@ let 
    ];

    sourceRoot = "source/libflux";

    cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk=";

    nativeBuildInputs = [ llvmPackages.libclang ];

    nativeBuildInputs = [ rustPlatform.bindgenHook ];

    buildInputs = lib.optional stdenv.isDarwin libiconv;

    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

    pkgcfg = ''

      Name: flux

      Version: ${libflux_version}

pkgs/servers/nosql/influxdb2/default.nix

+1 −4
Original line number Diff line number Diff line 
{ buildGoModule

, fetchFromGitHub

, fetchurl

, fetchpatch

, go-bindata

, lib

, llvmPackages

, perl

, pkg-config

, rustPlatform
@@ -43,9 +41,8 @@ let 
    };

    sourceRoot = "source/libflux";

    cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw=";

    nativeBuildInputs = [ llvmPackages.libclang ];

    nativeBuildInputs = [ rustPlatform.bindgenHook ];

    buildInputs = lib.optional stdenv.isDarwin libiconv;

    LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

    pkgcfg = ''

      Name: flux

      Version: ${libflux_version}