diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-26 22:59:34 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-30 18:18:29 +0200 |
| commit | 69a17c7a19481a734640218b2fd25a6689d15d58 (patch) | |
| tree | 5a401eb4567eba7c57239be81e7384893e374378 /pkgs/development/libraries/gvfs | |
| parent | ca6442bc33cf3d1c96c34012817b84ab93cd63a5 (diff) | |
| download | nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar.gz nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar.bz2 nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar.lz nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar.xz nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.tar.zst nixpkgs-69a17c7a19481a734640218b2fd25a6689d15d58.zip | |
Revert "treewide: remove placeholder usage"
This reverts commit 82f626702314928c9c8f4ea309430e3aa0680d57.
Diffstat (limited to 'pkgs/development/libraries/gvfs')
| -rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 86cbd01a602..360c1fb41f4 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { # Uncomment when switching back to meson # mesonFlags = [ - # "-Dgio_module_dir=lib/gio/modules" - # "-Dsystemduserunitdir=lib/systemd/user" - # "-Ddbus_service_dir=share/dbus-1/services" + # "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules" + # "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + # "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" # "-Dtmpfilesdir=no" # ] ++ stdenv.lib.optionals (!gnomeSupport) [ # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" |