diff options
| author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
| commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
| tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/tools/package-management | |
| parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) | |
| download | nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.gz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.bz2 nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.lz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.xz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.zst nixlib-133103d7094c148bdc9152562b16c8872c44f345.zip | |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/clib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index eb8f5ef186f1..75c47dda0c40 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ curl ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5c55ac31588c..ce2936f96f3f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -94,9 +94,9 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = "profiledir=$(out)/etc/profile.d"; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; - installFlags = "sysconfdir=$(out)/etc"; + installFlags = [ "sysconfdir=$(out)/etc" ]; doInstallCheck = true; # not cross |