about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2019-10-20 09:47:44 -0700
committerRenaud <c0bw3b@users.noreply.github.com>2019-10-20 18:47:44 +0200
commit7c6f46511d310936f509535d59656fe47c88f18f (patch)
treee898f486ae8b4d4715a391940a51b8cc36c03c8d /pkgs/tools
parente30988e506b58475e8f7173082ecdcb484c375a4 (diff)
facter: 3.13.2 -> 3.14.5 (#64019)
* facter: 3.13.2 -> 3.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/facter/versions

* facter: 3.14.0 -> 3.14.5
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/system/facter/default.nix19
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index ee9cdf3612943..ad90a52a5bdb6 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,29 +2,30 @@
 
 stdenv.mkDerivation rec {
   pname = "facter";
-  version = "3.13.2";
+  version = "3.14.5";
 
   src = fetchFromGitHub {
-    sha256 = "1yaj1qlyzsaffzpm4zmzm53mc6bhpzka8wc3dfk909nzykxg34zf";
+    sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5";
     rev = version;
-    repo = "facter";
+    repo = pname;
     owner = "puppetlabs";
   };
 
   CXXFLAGS = "-fpermissive -Wno-error=catch-value";
   NIX_LDFLAGS = "-lblkid";
 
-  cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
+  cmakeFlags = [ 
+    "-DFACTER_RUBY=${ruby}/lib/libruby.so"
+    "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby"
+  ];
 
-  # since we cant expand $out in cmakeFlags
-  preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\"";
-
-  buildInputs = [ boost cmake cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/puppetlabs/facter;
+    homepage = "https://github.com/puppetlabs/facter";
     description = "A system inventory tool";
     license = licenses.asl20;
     maintainers = [ maintainers.womfoo ];