diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-25 17:44:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
| commit | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (patch) | |
| tree | 544a86c87280e6870fefe3005d2b9387a6b48581 /pkgs/os-specific/linux | |
| parent | 632d24f11f51cc1581e921aa0eb8c6669296e8de (diff) | |
| download | nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar.gz nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar.bz2 nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar.lz nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar.xz nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.tar.zst nixpkgs-85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e.zip | |
treewide: Make more complicated configureFlags lists
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-firmware/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ipsec-tools/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iptables/default.nix | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index fb312b6bcb0..53fcf7d6843 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0gfcyj5anckjn030wcxx5v2xk2s219nyf99s9m833275b5wz2piw"; }; - configureFlags = '' - --with-hotplug-dir=$(out)/lib/firmware - ''; + configureFlags = [ + "--with-hotplug-dir=$(out)/lib/firmware" + ]; dontStrip = true; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index e27f380ac3e..dd7d25716dc 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; - configureFlags = '' - --sysconfdir=/etc --localstatedir=/var - --with-kernel-headers=${linuxHeaders}/include - --disable-security-context - --enable-adminport - --enable-dpd - --enable-frag - --enable-gssapi - --enable-hybrid - --enable-natt - --enable-shared - --enable-stats - ''; + configureFlags = [ + "--sysconfdir=/etc --localstatedir=/var" + "--with-kernel-headers=${linuxHeaders}/include" + "--disable-security-context" + "--enable-adminport" + "--enable-dpd" + "--enable-frag" + "--enable-gssapi" + "--enable-hybrid" + "--enable-natt" + "--enable-shared" + "--enable-stats" + ]; meta = { homepage = http://ipsec-tools.sourceforge.net/; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 0c088ac2a4b..9fa7a2cf0aa 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" ''; - configureFlags = '' - --enable-devel - --enable-shared - ''; + configureFlags = [ + "--enable-devel" + "--enable-shared" + ]; outputs = [ "out" "dev" ]; |