From bb890c45612a14e7f9fb8bc08d24e6d0a5d0402c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 3 Jan 2020 11:44:23 -0500 Subject: [PATCH] double-conversion: remove the "static" option pkgsStatic.double-conversion already has CMAKE_BUILD_SHARED set to OFF. --- pkgs/development/libraries/double-conversion/default.nix | 4 ++-- pkgs/top-level/static.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 4d8f623b36a4..ecd5ee67cf64 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, static ? false }: +{ stdenv, lib, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "double-conversion"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; # Case sensitivity issue preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 8886e6bb9b41..bcf68b17a66f 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -184,9 +184,6 @@ in { static = true; twisted = null; }; - double-conversion = super.double-conversion.override { - static = true; - }; gmp = super.gmp.override { withStatic = true; };