From 951a5bcc7ab91d2a57b2322a777212b5feb2c6bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:23:00 -0500 Subject: [PATCH] facter: enable on darwin --- pkgs/tools/system/facter/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b6a04f808a4..a4065cce864 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - CXXFLAGS = "-fpermissive -Wno-error=catch-value"; - NIX_LDFLAGS = "-lblkid"; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid"; cmakeFlags = [ - "-DFACTER_RUBY=${ruby}/lib/libruby.so" + "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A system inventory tool"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }