pyrox.dev
xorg.libXt: re-split into multiple outputs
Fixed all 'libXt}' references, too.
+1
-1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+1
-1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
···
70
70
''
71
71
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
72
72
}
73
-
patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
73
+
patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i
74
74
done
75
75
76
76
for i in lib/VBoxOGL*.so
+1
-1
pkgs/servers/x11/xorg/overrides.nix
+1
-1
pkgs/servers/x11/xorg/overrides.nix
···
127
127
'';
128
128
propagatedBuildInputs = [ xorg.libSM ];
129
129
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
130
-
outputs = [ "out" "doc" "man" ];
130
+
outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages)
131
131
};
132
132
133
133
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+2
-2
pkgs/tools/system/plan9port/builder.sh
+2
-2
pkgs/tools/system/plan9port/builder.sh
···
5
5
6
6
configurePhase()
7
7
{
8
-
echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
9
-
echo X11=\"${libXt}/include\" >> LOCAL.config
8
+
echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config
9
+
echo X11=\"${libXt_dev}/include\" >> LOCAL.config
10
10
11
11
for f in `grep -l -r /usr/local/plan9`; do
12
12
sed "s,/usr/local/plan9,${PLAN9},g" -i $f