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/servers/x11/xorg/overrides.nix | |
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/servers/x11/xorg/overrides.nix')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2438c49d9cb..0023c2c070a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -77,7 +77,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; - configureFlags = "--enable-xkb --enable-xinput"; + configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }; @@ -147,7 +147,7 @@ in # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 # Once the bug is fixed upstream, this can be removed. luit = attrs: attrs // { - configureFlags = "--disable-selective-werror"; + configureFlags = [ "--disable-selective-werror" ]; }; compositeproto = attrs: attrs // { @@ -408,7 +408,7 @@ in }; xkbcomp = attrs: attrs // { - configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; + configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; }; xkeyboardconfig = attrs: attrs // { @@ -597,7 +597,7 @@ in xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; - configureFlags = "--with-cursordir=$(out)/share/icons"; + configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }; xinit = attrs: attrs // { @@ -627,7 +627,7 @@ in }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; - configureFlags = "--with-default-dri=3 --enable-tools"; + configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; @@ -672,7 +672,7 @@ in }; xrdb = attrs: attrs // { - configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ]; }; sessreg = attrs: attrs // { |