JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

double-conversion: remove the "static" option

Browse Source 
pkgsStatic.double-conversion already has CMAKE_BUILD_SHARED set to OFF.
This commit is contained in:
Dmitry Kalinkin 2020-01-03 11:44:23 -05:00
parent 4541012bdb
commit bb890c4561
No known key found for this signature in database
GPG Key ID: 06AF1D3C38F04E0E
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/double-conversion/default.nix
View File

@ -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 ''

3
pkgs/top-level/static.nix
View File

@ -184,9 +184,6 @@ in {
static = true;
twisted = null;
};
double-conversion = super.double-conversion.override {
static = true;
};
gmp = super.gmp.override {
withStatic = true;
};