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 | db965063b346a33cc3f6363a40cbde2658d2cd23 (patch) | |
tree | f6c76998d8a18f09d782000922a0429cbaacf8b9 /pkgs/os-specific/linux | |
parent | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (diff) | |
download | nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.gz nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.bz2 nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.lz nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.xz nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.zst nixpkgs-db965063b346a33cc3f6363a40cbde2658d2cd23.zip |
treewide: Make configureFlags lists
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/alsa-oss/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/drbd/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/hwdata/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pm-utils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pmount/default.nix | 15 | ||||
-rw-r--r-- | pkgs/os-specific/linux/udisks/1-default.nix | 2 |
7 files changed, 19 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index a13e178e418..431353e234e 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ncurses libsamplerate ]; nativeBuildInputs = [ gettext ]; - configureFlags = "--disable-xmlto"; + configureFlags = [ "--disable-xmlto" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 376c42a8f9b..86d9aeebf1b 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; - configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; + configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 8d18d598020..c6792ea17fb 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ flex perl ]; - configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; + configureFlags = [ + "--without-distro" + "--without-pacemaker" + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index c1d324de7cf..2b296ebabca 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ./configure"; - configureFlags = "--datadir=$(prefix)/data"; + configureFlags = [ "--datadir=$(prefix)/data" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index a5577b97b87..b314e8db837 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ "--sysconfdir=/etc" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 1a7a31d978a..ea34075210d 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { buildInputs = [ intltool utillinux ]; - configureFlags = "" - + " --with-media-dir=${mediaDir}" - + " --with-lock-dir=${lockDir}" - + " --with-whitelist=${whiteList}" - + " --with-mount-prog=${utillinux}/bin/mount" - + " --with-umount-prog=${utillinux}/bin/umount" - + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"; + configureFlags = [ + "--with-media-dir=${mediaDir}" + "--with-lock-dir=${lockDir}" + "--with-whitelist=${whiteList}" + "--with-mount-prog=${utillinux}/bin/mount" + "--with-umount-prog=${utillinux}/bin/umount" + "--with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" + ]; postConfigure = '' # etc/Mafile.am is hardcoded and it does not respect the --prefix option. diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 199523db428..bdc6a63f069 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = "--localstatedir=/var --enable-lvm2"; + configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; |