aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/system/facter/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/system/facter/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/system/facter/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix
index 0d2d704ea6c..01fd10d6777 100644
--- a/nixpkgs/pkgs/tools/system/facter/default.nix
+++ b/nixpkgs/pkgs/tools/system/facter/default.nix
@@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.14.10";
+ version = "3.14.12";
src = fetchFromGitHub {
- sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji";
+ sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc";
rev = version;
repo = pname;
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;
};
}