diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2019-05-16 02:07:36 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2019-05-16 02:11:38 +0200 |
| commit | bb04ef538ba21978a8e0eed1896aa6f6e4822b14 (patch) | |
| tree | ecac588a6207445bebb67d71268280dfa0af03f3 /pkgs/os-specific/linux/audit | |
| parent | a9c7679ace80602b15de3c2b30dd6ec838e6c254 (diff) | |
| download | nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar.gz nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar.bz2 nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar.lz nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar.xz nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.tar.zst nixpkgs-bb04ef538ba21978a8e0eed1896aa6f6e4822b14.zip | |
audit: Fix build with pkgsMusl.
The previous patches no longer applied to the current code. Also declare necessary autoconf, automake, libtool dependencies. Without them, the musl build gets: /build/audit-2.8.5/missing: line 81: aclocal-1.16: command not found configure.ac:16: warning: macro 'AM_PROG_LIBTOOL' not found in library sh: autom4te: not found
Diffstat (limited to 'pkgs/os-specific/linux/audit')
| -rw-r--r-- | pkgs/os-specific/linux/audit/default.nix | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index d05eaf4b84e..c7d0a25d9fe 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,12 +1,14 @@ { stdenv, buildPackages, fetchurl, fetchpatch, + runCommand, + autoconf, automake, libtool, enablePython ? false, python ? null, }: assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.5"; + name = "audit-2.8.5"; # at the next release, remove the patches below! src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc autoconf automake libtool ]; buildInputs = stdenv.lib.optional enablePython python; configureFlags = [ @@ -29,17 +31,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # TODO: Remove the musl patches when + # https://github.com/linux-audit/audit-userspace/pull/25 + # is available with the next release. patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0002-auparse-remove-use-of-rawmemchr.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; - name = "0002-auparse-remove-use-of-rawmemchr.patch"; - sha256 = "1caaqbfgb2rq3ria5bz4n8x30ihgihln6w9w9a46k62ba0wh9rkz"; - }) - (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/audit/0003-all-get-rid-of-strndupa.patch?id=3e57180fdf3f90c30a25aea44f57846efc93a696"; - name = "0003-all-get-rid-of-strndupa.patch"; - sha256 = "1ddrm6a0ijrf7caw1wpw2kkbjp2lkxkmc16v51j5j7dvdalc6591"; - }) + ( + let patch = fetchpatch { + url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; + name = "Add-substitue-functions-for-strndupa-rawmemchr.patch"; + sha256 = "015bvzflg1s1k5viap30nznlpjj44a66khyc8yq0waa68qwvdlsd"; + }; + in + runCommand "Add-substitue-functions-for-strndupa-rawmemchr.patch-fix-copyright-merge-conflict" {} '' + cp ${patch} $out + substituteInPlace $out --replace \ + '-* Copyright (c) 2007-09,2011-16,2018 Red Hat Inc., Durham, North Carolina.' \ + '-* Copyright (c) 2007-09,2011-16 Red Hat Inc., Durham, North Carolina.' + '' + ) ]; prePatch = '' |