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

xorg.libXt: re-split into multiple outputs

Browse Source 
Fixed all 'libXt}' references, too.
This commit is contained in:
Vladimír Čunát 2015-10-05 11:22:48 +02:00
parent 328eafa885
commit 32b31398eb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i
done
for i in lib/VBoxOGL*.so

2
pkgs/servers/x11/xorg/overrides.nix
View File

@ -127,7 +127,7 @@ in
'';
propagatedBuildInputs = [ xorg.libSM ];
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
outputs = [ "out" "doc" "man" ];
outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages)
};
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792

4
pkgs/tools/system/plan9port/builder.sh
View File

@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9
configurePhase()
{
echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
echo X11=\"${libXt}/include\" >> LOCAL.config
echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config
echo X11=\"${libXt_dev}/include\" >> LOCAL.config
for f in `grep -l -r /usr/local/plan9`; do
sed "s,/usr/local/plan9,${PLAN9},g" -i $f

2
pkgs/tools/system/plan9port/default.nix
View File

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
inherit libXt;
libXt_dev = libXt.dev;
inherit fontconfig;
}