From 4541012bdbcb5da522e056b75808fa5fa263fc23 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 3 Jan 2020 11:37:39 -0500 Subject: [PATCH] glog: remove the "static" option pkgsStatic.glog already has CMAKE_BUILD_SHARED set to OFF. --- pkgs/development/libraries/glog/default.nix | 4 ++-- pkgs/top-level/static.nix | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 7809dc088427..04846c3ab427 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -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" diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index aa31996b8724..8886e6bb9b41 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -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; };