diff options
author | Robin Gloster <mail@glob.in> | 2019-10-30 12:34:47 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:16:46 +0100 |
commit | 313da176d35efefbcf36b41ec348c38403581e83 (patch) | |
tree | cd7bba63111f2330601c18f0b2a33b65c3b9bbab /pkgs/desktops | |
parent | f9f46dc327c7e659e84d558f1309e16e16e8245a (diff) | |
download | nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.gz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.bz2 nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.lz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.xz nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.tar.zst nixpkgs-313da176d35efefbcf36b41ec348c38403581e83.zip |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d29178b220d..582793ff590 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -148,11 +148,9 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; - NIX_CFLAGS_COMPILE = [ # Default for release buildtype but passed manually because # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 59f282d7411..83778aa8fff 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -9,7 +9,7 @@ mkXfceDerivation { nativeBuildInputs = [ automakeAddFlags ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0" ]; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 |