ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 08:39:08 +03:00
Code Issues Projects Releases Wiki Activity

phpExtensions.datadog_trace: prevent buildPecl to always use the same version of PHP

Browse Source
This commit is contained in:
Pol Dellaiera 2023-07-10 16:52:47 +02:00
parent bcb9b2b723
commit 020b80bf26
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/php-packages/datadog_trace/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, php
, buildPecl
, cargo
, rustc
, fetchFromGitHub
@ -8,12 +8,10 @@
, curl
, pcre2
, libiconv
, CoreFoundation
, Security
, Libsystem
, darwin
}:
php.buildPecl rec {
buildPecl rec {
pname = "datadog_trace";
version = "0.89.0";
@ -37,14 +35,14 @@ php.buildPecl rec {
nativeBuildInputs = [
cargo
rustc
rustPlatform.bindgenHook
rustPlatform.cargoSetupHook
darwin.apple_sdk_11_0.rustPlatform.bindgenHook
darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook
];
buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [
CoreFoundation
Security
Libsystem
darwin.apple_sdk_11_0.frameworks.CoreFoundation
darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.Libsystem
libiconv
];
@ -52,7 +50,7 @@ php.buildPecl rec {
changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = with lib.licenses; [ asl20 /* or */ bsd3 ];
license = with lib.licenses; [ asl20 bsd3 ];
maintainers = lib.teams.php.members;
};
}

5
pkgs/top-level/php-packages.nix
View File

@ -222,9 +222,8 @@ lib.makeScope pkgs.newScope (self: with self; {
couchbase = callPackage ../development/php-packages/couchbase { };
datadog_trace = pkgs.darwin.apple_sdk_11_0.callPackage ../development/php-packages/datadog_trace {
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security CoreFoundation;
inherit (pkgs.darwin.apple_sdk_11_0) Libsystem;
datadog_trace = callPackage ../development/php-packages/datadog_trace {
inherit (pkgs) darwin;
};
ds = callPackage ../development/php-packages/ds { };