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/desktops/gnome-3/apps | |
| parent | ca6442bc33cf3d1c96c34012817b84ab93cd63a5 (diff) | |
| download | nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar.gz nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar.bz2 nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar.lz nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar.xz nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.tar.zst nixlib-69a17c7a19481a734640218b2fd25a6689d15d58.zip | |
Revert "treewide: remove placeholder usage"
This reverts commit 82f626702314928c9c8f4ea309430e3aa0680d57.
Diffstat (limited to 'pkgs/desktops/gnome-3/apps')
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/file-roller/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 45aab553c418..42f0ddc6e4bb 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; postPatch = '' chmod +x postinstall.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index b5525957d468..92ce0eb8debb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ]; mesonFlags = [ - "-Ddbus_service_dir=share/dbus-1/services" + "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services" ]; meta = with stdenv.lib; { |