From 70e4540d3b4d742718dfb5d9747acd9077c7aab3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jan 2020 19:00:08 +0100 Subject: [PATCH] gflags: fix static musl build --- pkgs/development/libraries/gflags/default.nix | 11 ++++++++--- pkgs/top-level/static.nix | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 2e818ea94ea587..8342bdc284fc3c 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv +, fetchFromGitHub +, cmake +, enableShared ? true +, enableStatic ? true +}: stdenv.mkDerivation rec { pname = "gflags"; @@ -17,8 +22,8 @@ stdenv.mkDerivation rec { preConfigure = "rm BUILD"; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=ON" + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" + "-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}" ]; doCheck = false; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 687086b6ed3b29..7966b8f8c7ea32 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -176,6 +176,12 @@ in { cdo = super.cdo.override { enable_all_static = true; }; + + gflags = super.gflags.override { + enableStatic = true; + enableShared = false; + }; + gsm = super.gsm.override { staticSupport = true; };