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

xorg.{libICE,libSM}: split dev and doc outputs

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-13 14:50:31 +02:00
parent 783c40eb68
commit fa6ddd7fa6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
# These variables are used by configure to find some dependencies. # These variables are used by configure to find some dependencies.
SEARCH_INCLUDE = SEARCH_INCLUDE =
"${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
SEARCH_LIB = SEARCH_LIB =
"${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib " "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
+ optionalString withMesa "${mesa}/lib "; + optionalString withMesa "${mesa.out}/lib ";
# Work around a bug in configure. # Work around a bug in configure.
NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";

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

@ -140,6 +140,10 @@ in
propagatedBuildInputs = [ xorg.fixesproto ]; propagatedBuildInputs = [ xorg.fixesproto ];
}; };
libICE = attrs: attrs // {
outputs = [ "dev" "out" "doc" ];
};
libXcomposite = attrs: attrs // { libXcomposite = attrs: attrs // {
outputs = [ "dev" "out" "man" ]; outputs = [ "dev" "out" "man" ];
propagatedBuildInputs = [ xorg.libXfixes ]; propagatedBuildInputs = [ xorg.libXfixes ];
@ -196,8 +200,10 @@ in
propagatedBuildInputs = [xorg.libXrender]; propagatedBuildInputs = [xorg.libXrender];
}; };
libSM = attrs: attrs libSM = attrs: attrs // {
// { propagatedBuildInputs = [ xorg.libICE ]; }; outputs = [ "dev" "out" "doc" ];
propagatedBuildInputs = [ xorg.libICE ];
};
libXrender = attrs: attrs // { libXrender = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; outputs = [ "dev" "out" "doc" ];

4
pkgs/top-level/python-packages.nix
View File

@ -13478,7 +13478,7 @@ let
patchPhase = '' patchPhase = ''
cp "${x_ignore_nofocus}/cpp/linux-specific/"* . cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6"
gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
gcc -shared \ gcc -shared \
-Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \
@ -14692,7 +14692,7 @@ let
# I don't know why I need to add these libraries. Shouldn't they # I don't know why I need to add these libraries. Shouldn't they
# be part of wxPython? # be part of wxPython?
postInstall = '' postInstall = ''
libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]}
wrapProgram $out/bin/taskcoach.py \ wrapProgram $out/bin/taskcoach.py \
--prefix LD_LIBRARY_PATH : $libspaths --prefix LD_LIBRARY_PATH : $libspaths
''; '';