diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-18 01:53:13 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:17:12 +0100 |
| commit | db81e221487e8f97018b15c20270044c24c6e918 (patch) | |
| tree | 47b2a3fdc968f5bd5c8fa92437d3f6e07952dec3 /pkgs/desktops/gnome-3 | |
| parent | bff9b546e4722923e86afc99ccacace31f70ee77 (diff) | |
| download | nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.gz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.bz2 nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.lz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.xz nixlib-db81e221487e8f97018b15c20270044c24c6e918.tar.zst nixlib-db81e221487e8f97018b15c20270044c24c6e918.zip | |
treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
Diffstat (limited to 'pkgs/desktops/gnome-3')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix index b0e9652a9c51..3749be2de27f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}' substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix index d3d6f4e471c4..7759d21960cb 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Only needed to make it build preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix index b0e9652a9c51..3749be2de27f 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}' substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix index 1db969651317..a13370e5c9a9 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # Only needed to make it build preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" ''; configureFlags = [ "--sysconfdir=/etc" |