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

SDL: split the dev output and fix referrers

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-11 16:21:43 +02:00
parent 8e381b89a1
commit 9da12a6713
20 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/avidemux/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" + cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" +
" -DGETTEXT_INCLUDE_DIR=${gettext}/include" + " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
" -DSDL_INCLUDE_DIR=${SDL}/include/SDL"; " -DSDL_INCLUDE_DIR=${SDL.dev}/include/SDL";
NIX_LDFLAGS="-lpthread"; NIX_LDFLAGS="-lpthread";

2
pkgs/applications/video/gnash/default.nix
View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
preConfigure = preConfigure =
'' configureFlags=" \ '' configureFlags=" \
--with-sdl-incl=${SDL}/include/SDL \ --with-sdl-incl=${SDL.dev}/include/SDL \
--with-npapi-plugindir=$out/plugins \ --with-npapi-plugindir=$out/plugins \
--enable-media=gst \ --enable-media=gst \
--without-gconf --without-gconf

2
pkgs/development/interpreters/love/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
''; '';
NIX_CFLAGS_COMPILE = '' NIX_CFLAGS_COMPILE = ''
-I${SDL}/include/SDL -I${SDL.dev}/include/SDL
-I${freetype}include/freetype2 -I${freetype}include/freetype2
''; '';

5
pkgs/development/libraries/SDL/default.nix
View File

@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
}; };
outputs = [ "out" "man" ]; outputs = [ "dev" "out" "man" ];
outputBin = "dev"; # sdl-config
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b"; sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
}) ]; }) ];
postFixup = ''_moveToOutput share/aclocal "$dev" '';
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
patches = let patches = let
f = rev: sha256: fetchurl { f = rev: sha256: fetchurl {

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

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/smpeg-config \ wrapProgram $out/bin/smpeg-config \
--prefix PATH ":" "${pkgconfig}/bin" \ --prefix PATH ":" "${pkgconfig}/bin" \
--prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig" --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
''; '';
meta = { meta = {

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

@ -5,7 +5,7 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ];
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreFoundation -framework OpenGL -framework Cocoa"; "-framework CoreFoundation -framework OpenGL -framework Cocoa";

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

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makefile = "Makefile.linux"; makefile = "Makefile.linux";
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
NIX_LDFLAGS = "-lGL"; NIX_LDFLAGS = "-lGL";

8
pkgs/games/dwarf-fortress/default.nix
View File

@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
sourceRoot = srcs.df_unfuck.name; sourceRoot = srcs.df_unfuck.name;
cmakeFlags = [ cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
]; ];
permission = ./df_permission; permission = ./df_permission;
@ -85,7 +85,9 @@ stdenv.mkDerivation rec {
done done
# now run Dwarf Fortress! # now run Dwarf Fortress!
export LD_LIBRARY_PATH=\${stdenv.cc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ export LD_LIBRARY_PATH='${stdenv.lib.makeLibraryPath
[ stdenv.cc SDL SDL_image SDL_ttf gtk2 glib mesa openal libsndfile ]
}':\$DF_DIR/df_linux/libs/
export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
#export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing.

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

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-tcl=${tcl}/lib" ]; configureFlags = [ "--with-tcl=${tcl}/lib" ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
''; '';
meta = { meta = {

6
pkgs/games/hedgewars/default.nix
View File

@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
-rpath ${SDL_mixer}/lib -rpath ${SDL_mixer}/lib
-rpath ${SDL_net}/lib -rpath ${SDL_net}/lib
-rpath ${SDL_ttf}/lib -rpath ${SDL_ttf}/lib
-rpath ${SDL}/lib -rpath ${SDL.out}/lib
-rpath ${libpng}/lib -rpath ${libpng.out}/lib
-rpath ${lua5_1}/lib -rpath ${lua5_1}/lib
-rpath ${mesa}/lib -rpath ${mesa}/lib
-rpath ${zlib}/lib -rpath ${zlib.out}/lib
" "
''; '';

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

@ -16,7 +16,7 @@ rec {
preBuild = a.fullDepEntry ('' preBuild = a.fullDepEntry (''
sed -e "s@/usr/games@$out/bin@g" -i Makefile sed -e "s@/usr/games@$out/bin@g" -i Makefile
sed -e "s@/usr/@$out/@g" -i Makefile sed -e "s@/usr/@$out/@g" -i Makefile
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL"
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */

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

@ -30,7 +30,7 @@ rec {
phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
setVars = a.noDepEntry ('' setVars = a.noDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL"
''); '');
meta = { meta = {

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

@ -20,7 +20,7 @@ stdenv.mkDerivation {
inherit (s) url sha256; inherit (s) url sha256;
}; };
preBuild = '' preBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp
''; '';

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

@ -11,7 +11,7 @@ stdenv.mkDerivation {
patches = [ ./moderinze_cpp.patch ]; patches = [ ./moderinze_cpp.patch ];
preConfigure = '' preConfigure = ''
export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" export CPPFLAGS="-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"
autoreconf -i autoreconf -i
''; '';

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

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [python pil pygame SDL]; buildInputs = [python pil pygame SDL];
configurePhase = '' configurePhase = ''
sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py; sed -e "/includes = /aincludes.append('${SDL.dev}/include/SDL')" -i setup.py;
sed -e "/includes = /aincludes.append('$(echo ${pygame}/include/python*)')" -i setup.py; sed -e "/includes = /aincludes.append('$(echo ${pygame}/include/python*)')" -i setup.py;
cat setup.py; cat setup.py;
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
postUnpack = optionalString debug postUnpack = optionalString debug
"mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; "mkdir -p $out/src; cp -R * $out/src ; cd $out/src";
NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL";
configureFlags = optionalString debug "--enable-debug"; configureFlags = optionalString debug "--enable-debug";
patchPhase = '' patchPhase = ''

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# The fpc is not properly wrapped to add -rpath. I add this manually. # The fpc is not properly wrapped to add -rpath. I add this manually.
# I even do a trick on lib/lib64 for libgcc, that I expect it will work. # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
preBuild = '' preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc}/lib64 -rpath ${stdenv.cc.cc}/lib" export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib"
sed -i 414,424d Makefile sed -i 414,424d Makefile
''; '';

4
pkgs/games/zdoom/default.nix
View File

@ -14,10 +14,10 @@ stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so"
"-DSDL_INCLUDE_DIR=${SDL}/include" "-DSDL_INCLUDE_DIR=${SDL.dev}/include"
]; ];
NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ]; NIX_CFLAGS_COMPILE = [ "-I ${SDL.dev}/include/SDL" ];
preConfigure = '' preConfigure = ''
sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h

2
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -182,7 +182,7 @@ in
extraBuildInputs = [ libpng SDL ]; extraBuildInputs = [ libpng SDL ];
}).override { }).override {
patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure"; patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure";
configurePhase = "./configure"; configurePhase = "./configure";
}; };

2
pkgs/tools/graphics/quirc/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
inherit (s) url sha256 rev; inherit (s) url sha256 rev;
}; };
NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL"; NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL";
configurePhase = '' configurePhase = ''
sed -e 's/-[og] root//g' -i Makefile sed -e 's/-[og] root//g' -i Makefile
''; '';