diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-28 10:17:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 04:50:37 +0100 |
| commit | ac8eaa85070e736af1548faeeb4b9b6e9976494d (patch) | |
| tree | 63237e5cb3c8d2815152ea725488de1a83572e42 /pkgs/os-specific/linux/apparmor | |
| parent | 20b02b80aa46b8dc96e256500e3c22fd0c22817d (diff) | |
| download | nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar.gz nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar.bz2 nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar.lz nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar.xz nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.tar.zst nixpkgs-ac8eaa85070e736af1548faeeb4b9b6e9976494d.zip | |
treewide: fix *Flags
Diffstat (limited to 'pkgs/os-specific/linux/apparmor')
| -rw-r--r-- | pkgs/os-specific/linux/apparmor/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 658c8441276..7030bc0ca31 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -124,8 +124,8 @@ let prePatch = prePatchCommon; inherit patches; postPatch = "cd ./utils"; - makeFlags = ''LANGS=''; - installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin VIM_INSTALL_PATH=$(out)/share PYPREFIX=''; + makeFlags = [ "LANGS=" ]; + installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ]; postInstall = '' for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do @@ -162,8 +162,8 @@ let prePatch = prePatchCommon; postPatch = "cd ./binutils"; - makeFlags = ''LANGS= USE_SYSTEM=1''; - installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin''; + makeFlags = [ "LANGS=" "USE_SYSTEM=1" ]; + installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" ]; inherit doCheck; @@ -187,8 +187,11 @@ let ''; inherit patches; postPatch = "cd ./parser"; - makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include AR=${stdenv.cc.bintools.targetPrefix}ar''; - installFlags = ''DESTDIR=$(out) DISTRO=unknown''; + makeFlags = [ + "LANGS=" "USE_SYSTEM=1" "INCLUDEDIR=${libapparmor}/include" + "AR=${stdenv.cc.bintools.targetPrefix}ar" + ]; + installFlags = [ "DESTDIR=$(out)" "DISTRO=unknown" ]; inherit doCheck; @@ -204,8 +207,8 @@ let buildInputs = [ libapparmor pam ]; postPatch = "cd ./changehat/pam_apparmor"; - makeFlags = ''USE_SYSTEM=1''; - installFlags = ''DESTDIR=$(out)''; + makeFlags = [ "USE_SYSTEM=1" ]; + installFlags = [ "DESTDIR=$(out)" ]; inherit doCheck; @@ -219,7 +222,7 @@ let nativeBuildInputs = [ which ]; postPatch = "cd ./profiles"; - installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles''; + installFlags = [ "DESTDIR=$(out)" "EXTRAS_DEST=$(out)/share/apparmor/extra-profiles" ]; inherit doCheck; |