From 4fb06f0916e992c49ff3f0ae6f35c52384f67a58 Mon Sep 17 00:00:00 2001 From: Nicolas Mattia Date: Thu, 26 Sep 2019 10:31:21 +0200 Subject: [PATCH] libpfm: enable static build --- pkgs/development/libraries/libpfm/default.nix | 8 ++++++-- pkgs/top-level/static.nix | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index d0572de537e..f48c605dafd 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, enableShared ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "4.10.1"; pname = "libpfm"; @@ -30,4 +30,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.pierron ]; platforms = platforms.linux; }; +} // stdenv.lib.optionalAttrs ( ! enableShared ) +{ + CONFIG_PFMLIB_SHARED = "n"; } +) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index bc6c3525f77..f3c524378ea 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -95,6 +95,9 @@ in { libiberty = super.libiberty.override { staticBuild = true; }; + libpfm = super.libpfm.override { + enableShared = false; + }; ipmitool = super.ipmitool.override { static = true; };