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

glog: remove the "static" option

Browse Source 
pkgsStatic.glog already has CMAKE_BUILD_SHARED set to OFF.
This commit is contained in:
Dmitry Kalinkin 2020-01-03 11:37:39 -05:00
parent 7e2c821e58
commit 4541012bdb
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/glog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl }:
stdenv.mkDerivation rec {
pname = "glog";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
checkInputs = [ perl ];
doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm"

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

@ -193,9 +193,6 @@ in {
gflags = super.gflags.override {
enableShared = false;
};
glog = super.glog.override {
static = true;
};
cdo = super.cdo.override {
enable_all_static = true;
};