diff options
| author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
| commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
| tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/desktops | |
| parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) | |
| download | nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.gz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.bz2 nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.lz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.xz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.zst nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.zip | |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/desktops')
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 10b99e4eb5d..c12d50d792f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./patches/mail-notification-dont-link-against-bsd-compat.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = "./jb configure prefix=$out"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 0e99d03c081..23e8080f01f 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-console-kit" ]; - makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; + makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 05f5936a6cb..b7c40153209 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; - NIX_LDFLAGS = [ "-ldl" "-lm" ]; + NIX_LDFLAGS = "-ldl -lm"; patches = [ ./rox-filer-2.11-in-source-build.patch @@ -23,7 +23,7 @@ in stdenv.mkDerivation { setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; # patch source with defined patches - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f7e500bdf54..f4d86247c6c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -11,7 +11,7 @@ mkXfceDerivation { buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = "-p1"; + patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do |