treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output
This commit is contained in:
parent
91b40bd9d2
commit
5d52f55426
@ -20,7 +20,7 @@ in
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "metacity";
|
||||
start = ''
|
||||
env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
|
||||
env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/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 # */
|
||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
#configureFlags = [ "--disable-print" ];
|
||||
|
||||
# "screenshot" needs this.
|
||||
NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
|
||||
NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"
|
||||
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
|
||||
|
||||
meta = {
|
||||
|
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
|
||||
${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
|
||||
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \
|
||||
launchers/launcher-linux-${arch}
|
||||
${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
|
||||
'';
|
||||
|
@ -66,7 +66,7 @@ stdenv.mkDerivation {
|
||||
[ "${xorg.libXrandr}/lib"
|
||||
"${xorg.libXrender}/lib"
|
||||
"${xorg.libXext}/lib"
|
||||
"${xorg.libX11}/lib"
|
||||
"${xorg.libX11.out}/lib"
|
||||
"${xorg.libXinerama}/lib"
|
||||
];
|
||||
|
||||
|
@ -12777,7 +12777,7 @@ let self = _self // overrides; _self = with self; {
|
||||
url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz";
|
||||
sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa";
|
||||
};
|
||||
makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib";
|
||||
makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib";
|
||||
buildInputs = with pkgs; [ xorg.libX11 libpng ];
|
||||
configurePhase = ''
|
||||
perl Makefile.PL PREFIX=$out $makeMakerFlags
|
||||
@ -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}/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}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
|
||||
meta = {
|
||||
description = "Get the idle time of X11";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user