Skip to content

Commit

Permalink
openscap: 1.3.10 -> 1.4.0
Browse files Browse the repository at this point in the history
Bumps openscap to the latest tag and enables building on all linux
platforms.
  • Loading branch information
jmbaur committed Nov 23, 2024
1 parent 80dd5c1 commit 7b36804
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions pkgs/by-name/op/openscap/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
openssl,
util-linux,
pcre2,
pcre,
libselinux,
graphviz,
glib,
Expand All @@ -29,7 +28,6 @@
installShellFiles,
rpm,
system-sendmail,
hyperscan,
gnome2,
curl,
procps,
Expand All @@ -42,13 +40,13 @@

stdenv.mkDerivation rec {
pname = "openscap";
version = "1.3.10";
version = "1.4.0";

src = fetchFromGitHub {
owner = "OpenSCAP";
repo = "openscap";
rev = version;
hash = "sha256-P7k+Ygz/XmpTSKBEqbyJsd1bIDVJ1HA/RJdrEtjYD5g=";
hash = "sha256-LYDXASy1yZA+GfUKaXUKyZgdRqGERvMeyVIHJFfCfII=";
};

strictDeps = true;
Expand Down Expand Up @@ -76,10 +74,8 @@ stdenv.mkDerivation rec {
openssl
valgrind
pcre2
pcre
libxslt
xmlsec
hyperscan
libselinux
libyaml
xmlbird
Expand Down Expand Up @@ -107,8 +103,7 @@ stdenv.mkDerivation rec {
--replace-fail "DESTINATION ''${PERL_VENDORLIB}" "DESTINATION ''${SWIG_PERL_DIR}''${PERL_VERSION}" \
--replace-fail "DESTINATION ''${PERL_VENDORARCH}" "DESTINATION ''${SWIG_PERL_DIR}"
substituteInPlace src/common/oscap_pcre.c \
--replace-fail "#include <pcre2.h>" "#include <${pcre2.dev}/include/pcre2.h>" \
--replace-fail "#include <pcre.h>" "#include <${pcre.dev}/include/pcre.h>"
--replace-fail "#include <pcre2.h>" "#include <${pcre2.dev}/include/pcre2.h>"
'';

cmakeFlags = [
Expand Down Expand Up @@ -139,7 +134,7 @@ stdenv.mkDerivation rec {
];

postBuild = ''
make docs
make $makeFlags docs
'';

installPhase = ''
Expand All @@ -155,6 +150,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl21Only;
maintainers = with lib.maintainers; [ tochiaha ];
mainProgram = "oscap";
platforms = [ "x86_64-linux" ];
platforms = lib.platforms.linux;
};
}

0 comments on commit 7b36804

Please sign in to comment.