dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #92290 from marsam/enable-facter-darwin

Browse Source 
facter: enable on darwin
This commit is contained in:
Mario Rodas 2020-07-04 18:17:46 -05:00 committed by GitHub
commit b0d53b7fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/cpp-hocon/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs"; owner = "puppetlabs";
}; };
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (src.meta) homepage; 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; license = licenses.asl20;
maintainers = [ maintainers.womfoo ]; maintainers = [ maintainers.womfoo ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

9
pkgs/development/libraries/leatherman/default.nix
View File

@ -11,12 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs"; owner = "puppetlabs";
}; };
NIX_CFLAGS_COMPILE = builtins.toString [ NIX_CFLAGS_COMPILE = "-Wno-error";
"-Wno-error=ignored-qualifiers"
"-Wno-error=class-memaccess"
"-Wno-error=catch-value"
"-Wno-error=deprecated-copy"
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost curl ruby ]; buildInputs = [ boost curl ruby ];
@ -28,7 +23,7 @@ stdenv.mkDerivation rec {
description = "A collection of C++ and CMake utility libraries"; description = "A collection of C++ and CMake utility libraries";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.womfoo ]; maintainers = [ maintainers.womfoo ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/development/libraries/libwhereami/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "puppetlabs"; owner = "puppetlabs";
}; };
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "Library to report hypervisor information from inside a VM"; description = "Library to report hypervisor information from inside a VM";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.womfoo ]; 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
}; };
} }

10
pkgs/tools/system/facter/default.nix
View File

@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
owner = "puppetlabs"; owner = "puppetlabs";
}; };
CXXFLAGS = "-fpermissive -Wno-error=catch-value"; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid";
cmakeFlags = [ cmakeFlags = [
"-DFACTER_RUBY=${ruby}/lib/libruby.so" "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby"
]; ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
description = "A system inventory tool"; description = "A system inventory tool";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.womfoo ]; maintainers = [ maintainers.womfoo ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }