public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace make/build/configure/patchFlags with nix lists

Browse Source
This commit is contained in:
Merijn Broeren
2019-12-30 12:58:11 +01:00
committed by Jan Tojnar
parent 08d5fc3934
commit 133103d709
248 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/containerd/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ];
buildInputs = [ btrfs-progs go-md2man utillinux ];
buildFlags = "VERSION=v${version}";
buildFlags = [ "VERSION=v${version}" ];
BUILDTAGS = []
++ optional (btrfs-progs == null) "no_btrfs";
pkgs/applications/virtualization/xen/generic.nix
+2 -2
View File
@@ -187,11 +187,11 @@ stdenv.mkDerivation (rec {
'';
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
#makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ];
makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
++ (config.makeFlags or []);
buildFlags = "xen tools";
buildFlags = [ "xen" "tools" ];
postBuild = ''
make -C docs man-pages