public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "treewide: remove placeholder usage"

Browse Source 
This reverts commit 82f6267023.
This commit is contained in:
Jan Tojnar
2018-04-26 22:59:34 +02:00
parent ca6442bc33
commit 69a17c7a19
14 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glib-networking/default.nix
View File

@@ -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

6
pkgs/development/libraries/gvfs/default.nix
View File

@@ -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"

4
pkgs/development/libraries/libwnck/3.x.nix
View File

@@ -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 {

2
pkgs/development/libraries/spice-gtk/default.nix
View File

@@ -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"