From 3c2d600fa35fa942e9c38e4e0f7ca80e4321b017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Oct 2025 10:22:26 +0100 Subject: [PATCH] Revert "double-conversion: add pkg-config and testing" --- pkgs/by-name/do/double-conversion/package.nix | 40 ++++--------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index 30e445519ee1..a377165483f0 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -4,19 +4,17 @@ fetchFromGitHub, fetchpatch, cmake, - ninja, - ctestCheckHook, - testers, + enableStatic ? stdenv.hostPlatform.isStatic, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation rec { pname = "double-conversion"; version = "3.3.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; - rev = "v${finalAttrs.version}"; + rev = "v${version}"; sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM="; }; @@ -32,46 +30,22 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch"; hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis="; }) - (fetchpatch { - name = "double-conversion-add-pkg-config.patch"; - url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch"; - hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4="; - }) ]; - outputs = [ - "out" - "dev" - ]; + nativeBuildInputs = [ cmake ]; - nativeBuildInputs = [ - cmake - ninja - ctestCheckHook - ]; - - doCheck = true; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" true) - (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries) - ]; + cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON"; # Case sensitivity issue preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' rm BUILD ''; - passthru = { - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - }; - meta = with lib; { - pkgConfigModules = [ "double-conversion" ]; description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix ++ platforms.windows; - maintainers = with lib.maintainers; [ fzakaria ]; + maintainers = [ ]; }; -}) +}