diff options
Diffstat (limited to 'pkgs/desktops')
7 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 62a224eb504a..4b769f5d0aea 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -15,5 +15,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl perlXMLParser libxml2 libxslt gettext]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; + configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ]; } diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index c7ed90905acd..0c8efc57c71f 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { buildInputs = [ intltool glib gtk ncurses ] ++ stdenv.lib.optionals pythonSupport [python pygtk]; - configureFlags = '' - ${if pythonSupport then "--enable-python" else "--disable-python"} - ''; + configureFlags = [ + (stdenv.lib.enableFeature pythonSupport "python") + ]; postInstall = stdenv.lib.optionalString pythonSupport '' cd $(toPythonPath $out)/gtk-2.0 diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index bea40431a24e..981b8504487b 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; - configureFlags = "--disable-fatal-warnings"; + configureFlags = [ "--disable-fatal-warnings" ]; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 9cd36cd77503..aeef5114435d 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 36bfa596e19c..bc5a78c5a4b2 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mate.mate-settings-daemon ]; - configureFlags = "--disable-update-mimedb"; + configureFlags = [ "--disable-update-mimedb" ]; meta = with stdenv.lib; { description = "Utilities to configure the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 25d90c753dc3..b4c215339b55 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mate.mate-menus ]; - configureFlags = "--without-console-kit"; + configureFlags = [ "--without-console-kit" ]; makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 0f281cfc004e..c3f29dff6319 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd ]; - configureFlags = "--enable-systemd"; + configureFlags = [ "--enable-systemd" ]; meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; |