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

xorg: split outputs of various libs

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-13 21:51:53 +02:00
parent 8c25f3ecaa
commit e25da7e5c8
5 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/xfig/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ imake makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";
NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
patches =
let

2
pkgs/development/libraries/libsoup/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation {
patchShebangs libsoup/
'';
outputs = [ "dev" "out" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]

2
pkgs/games/micropolis/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
preConfigure =
''
cd src
sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm.dev}/include/X11@" tk/makefile
sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
'';

2
pkgs/games/xsokoban/default.nix
View File

@ -21,7 +21,7 @@ rec {
preConfigure = a.fullDepEntry (''
sed -e 's/getline/my_getline/' -i score.c
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm.dev}/include/X11"
for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
chmod a+rw config.h
echo '#define HERE "@nixos-packaged"' >> config.h

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

@ -106,6 +106,7 @@ in
};
libXfont = attrs: attrs // {
outputs = [ "dev" "out" ];
propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
# prevents "misaligned_stack_error_entering_dyld_stub_binder"
configureFlags = lib.optionals isDarwin [
@ -150,6 +151,7 @@ in
};
libXaw = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc
propagatedBuildInputs = [ xorg.libXmu ];
};
@ -210,10 +212,19 @@ in
preConfigure = setMalloc0ReturnsNullCrossCompiling;
};
libXres = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc
};
libXv = attrs: attrs // {
outputs = [ "dev" "out" "doc" ]; # just dev-doc
};
libXvMC = attrs: attrs
// { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; };
libXpm = attrs: attrs // {
outputs = [ "dev" "out" "bin" ]; # tiny man in $bin
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
};
@ -224,6 +235,10 @@ in
outputs = [ "dev" "out" ]; # mainly to avoid propagation
};
libxshmfence = attrs: attrs // {
outputs = [ "dev" "out" ]; # mainly to avoid propagation
};
setxkbmap = attrs: attrs // {
postInstall =
''
@ -248,10 +263,22 @@ in
meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
};
xcbutilimage = attrs: attrs // {
outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
};
xcbutilkeysyms = attrs: attrs // {
outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
};
xcbutilrenderutil = attrs: attrs // {
outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
};
xcbutilwm = attrs: attrs // {
outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
};
xf86inputevdev = attrs: attrs // {
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
installFlags = "sdkdir=\${out}/include/xorg";
@ -361,6 +388,7 @@ in
in
if (!isDarwin)
then {
outputs = [ "dev" "out" ];
buildInputs = [ makeWrapper ] ++ commonBuildInputs;
propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
args.udev