From 69a17c7a19481a734640218b2fd25a6689d15d58 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Apr 2018 22:59:34 +0200 Subject: Revert "treewide: remove placeholder usage" This reverts commit 82f626702314928c9c8f4ea309430e3aa0680d57. --- pkgs/development/libraries/glib-networking/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 6 +++--- pkgs/development/libraries/libwnck/3.x.nix | 4 ++-- pkgs/development/libraries/spice-gtk/default.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index e0bbae69c4ff..3deaf28373dd 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules"; + PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules"; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 86cbd01a6026..360c1fb41f4e 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" diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 8efd908584e1..f2d05d14d693 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; propagatedBuildInputs = [ libX11 gtk3 ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f4f10978ec13..f5258c1cd6d8 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; configureFlags = [ "--with-gtk3" -- cgit 1.4.1 From 6cefc9c1b0fbe64c00094762ca535850b5186ec1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Apr 2018 22:59:45 +0200 Subject: Revert "treewide: remove placeholder usage" This reverts commit 025881c23649b1c99930081ec9dc6b9fcd04afb4. --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 3 --- pkgs/development/libraries/pipewire/default.nix | 2 +- pkgs/os-specific/linux/selinux-sandbox/default.nix | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 5d6f6b667e98..c355c9bbce69 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; - postPatch = '' - cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" - ''; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index c50fc9fb35c8..e87ed8e48a98 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { "-Denable_gstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 431f5e9ef517..71d2ee6e80af 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-m 4755" "-m 755" substituteInPlace sandboxX.sh \ --replace "#!/bin/sh" "#!${bash}/bin/sh" \ - --replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \ + --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \ --replace "/usr/bin/cut" "${coreutils}/bin/cut" \ --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ --replace "secon" "${policycoreutils}/bin/secon" -- cgit 1.4.1 From c1e53166ade2f84649e48366e3a21922a5291960 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 26 Apr 2018 23:00:36 +0200 Subject: Revert "sympow: don't use placeholder" This reverts commit bae15c811f182132c77f3c20b6785c9297e8498f. --- pkgs/development/libraries/science/math/sympow/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index c34701e3f913..f421755b6182 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -34,13 +34,11 @@ stdenv.mkDerivation rec { makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then - mkdir -p "$SYMPOW_LOCAL" - cp -r @out@/share/sympow/* "$SYMPOW_LOCAL" + mkdir -p "$SYMPOW_LOCAL" + cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL" chmod -R +xw "$SYMPOW_LOCAL" fi' \ --run 'cd "$SYMPOW_LOCAL"' - substituteInPlace $out/bin/sympow --subst-var out - runHook postInstall ''; -- cgit 1.4.1