mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 10:17:58 +00:00
Merge pull request #234465 from wegank/influxdb-refactor
influxdb, influxdb2: migrate to bindgenHook
This commit is contained in:
commit
f794726617
@ -1,4 +1,4 @@
|
||||
{ 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}
|
||||
|
@ -1,10 +1,8 @@
|
||||
{ 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}
|
||||
|
Loading…
Reference in New Issue
Block a user