diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:51 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:37 +0200 |
| commit | 40ef23e7ed521abb7161dde01806ca62c9ed25ba (patch) | |
| tree | 806c7401f3204ea123d1579fb2109fd906a94335 | |
| parent | eec609fcc191857a44a200bc401d6c7f8a51d97f (diff) | |
| download | nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar.gz nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar.bz2 nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar.lz nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar.xz nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.tar.zst nixpkgs-40ef23e7ed521abb7161dde01806ca62c9ed25ba.zip | |
treewide: Mass replace 'xorg.libXext}/lib' to refer the 'out' output
| -rw-r--r-- | nixos/modules/services/x11/window-managers/metacity.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 866bb441de4..2957ad91be4 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -20,7 +20,7 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/ + env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/ # !!! Hack: load the schemas for Metacity. GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \ --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index e9eba11513b..277da6f6e4b 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" - "${xorg.libXext}/lib" + "${xorg.libXext.out}/lib" "${xorg.libX11.out}/lib" "${xorg.libXinerama}/lib" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4a4640a8b8..053198bde2a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; |