diff options
| -rw-r--r-- | pkgs/tools/system/facter/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index ffb85393b9ab..9a95df94a1ca 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, utillinux }: +{ stdenv, fetchurl, boost, cmake, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }: stdenv.mkDerivation rec { name = "facter-${version}"; @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1kv4k9zqpsiw362kk1rw1a4sixd0pmnh57ghd4k4pffr2dkmdfsv"; }; + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; + + # since we cant expand $out in cmakeFlags + preConfigure = "cmakeFlags+=\" -DRUBY_LIB_INSTALL=$out/lib/ruby\""; + libyamlcpp_ = libyamlcpp.override { makePIC = true; }; - buildInputs = [ boost cmake curl leatherman libyamlcpp_ openssl utillinux ]; + buildInputs = [ boost cmake curl leatherman libyamlcpp_ openssl ruby utillinux ]; meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/facter; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c488660f56..382dfc03b305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -781,7 +781,9 @@ in ent = callPackage ../tools/misc/ent { }; - facter = callPackage ../tools/system/facter {}; + facter = callPackage ../tools/system/facter { + ruby = ruby_2_1; + }; fasd = callPackage ../tools/misc/fasd { }; |