mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 03:12:51 +00:00
xorg.libXt: re-split into multiple outputs
Fixed all 'libXt}' references, too.
This commit is contained in:
parent
328eafa885
commit
32b31398eb
@ -70,7 +70,7 @@ stdenv.mkDerivation {
|
|||||||
''
|
''
|
||||||
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
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
|
done
|
||||||
|
|
||||||
for i in lib/VBoxOGL*.so
|
for i in lib/VBoxOGL*.so
|
||||||
|
@ -127,7 +127,7 @@ in
|
|||||||
'';
|
'';
|
||||||
propagatedBuildInputs = [ xorg.libSM ];
|
propagatedBuildInputs = [ xorg.libSM ];
|
||||||
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
|
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
|
# See https://bugs.freedesktop.org/show_bug.cgi?id=47792
|
||||||
|
@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9
|
|||||||
|
|
||||||
configurePhase()
|
configurePhase()
|
||||||
{
|
{
|
||||||
echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
|
echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config
|
||||||
echo X11=\"${libXt}/include\" >> LOCAL.config
|
echo X11=\"${libXt_dev}/include\" >> LOCAL.config
|
||||||
|
|
||||||
for f in `grep -l -r /usr/local/plan9`; do
|
for f in `grep -l -r /usr/local/plan9`; do
|
||||||
sed "s,/usr/local/plan9,${PLAN9},g" -i $f
|
sed "s,/usr/local/plan9,${PLAN9},g" -i $f
|
||||||
|
@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
|
|||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit libXt;
|
libXt_dev = libXt.dev;
|
||||||
inherit fontconfig;
|
inherit fontconfig;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user