diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-07-04 18:17:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-04 18:17:46 -0500 |
commit | b0d53b7fe523a6c5e7836b98a5b9fb08267bdb6e (patch) | |
tree | 6cbbbcf86cf704279d5e0959af5d10bd2553e979 /pkgs | |
parent | 6eeb612a9b6160df2e110021d93bef3e6e538b9a (diff) | |
parent | 951a5bcc7ab91d2a57b2322a777212b5feb2c6bc (diff) |
Merge pull request #92290 from marsam/enable-facter-darwin
facter: enable on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/cpp-hocon/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/leatherman/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libwhereami/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/facter/default.nix | 10 |
4 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 00399616d9afb..47ec7a1a6eb4f 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = " A C++ port of the Typesafe Config library"; + description = "A C++ port of the Typesafe Config library"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 8a34f05f6cf0e..9522650449529 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,12 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ - "-Wno-error=ignored-qualifiers" - "-Wno-error=class-memaccess" - "-Wno-error=catch-value" - "-Wno-error=deprecated-copy" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; @@ -28,7 +23,7 @@ stdenv.mkDerivation rec { description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 9238827d70eab..59e349b4e6a17 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; # fails on aarch64 + platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 }; } diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b6a04f808a4c1..a4065cce8644b 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; }; } |