diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2021-01-23 16:48:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 16:48:41 +0000 |
commit | 264abb7c7e28dc31bfc6d58c4e786d437a1d68e9 (patch) | |
tree | 9625a60a364dae17c2170e53237624e5fcec3d29 /pkgs/os-specific/linux/audit/default.nix | |
parent | c938459ce0e882fe2863bef66e9f5fa657240bbc (diff) | |
parent | 963286d5b6f52b3fc8d3a510db755507c50a6bee (diff) | |
download | nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar.gz nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar.bz2 nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar.lz nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar.xz nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.tar.zst nixpkgs-264abb7c7e28dc31bfc6d58c4e786d437a1d68e9.zip |
Merge branch 'staging' into audit-static
Diffstat (limited to 'pkgs/os-specific/linux/audit/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/audit/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 91bf941cf6d..0adc5f7aeb2 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,5 +1,5 @@ { - stdenv, buildPackages, fetchurl, fetchpatch, + lib, stdenv, buildPackages, fetchurl, fetchpatch, runCommand, autoconf, automake, libtool, enablePython ? false, python ? null, @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.hostPlatform.isMusl + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl [ autoconf automake libtool ]; - buildInputs = stdenv.lib.optional enablePython python; + buildInputs = lib.optional enablePython python; configureFlags = [ # z/OS plugin is not useful on Linux, @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = [ ./patches/weak-symbols.patch ] ++ - stdenv.lib.optional stdenv.hostPlatform.isMusl [ + patches = [ ./patches/weak-symbols.patch ] + ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "https://people.redhat.com/sgrubb/audit/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; }; } |