From 9da12a6713b100367809e53e6419a01229f5f61e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 11 Oct 2015 16:21:43 +0200 Subject: SDL: split the dev output and fix referrers --- pkgs/games/beret/default.nix | 2 +- pkgs/games/bitsnbots/default.nix | 2 +- pkgs/games/dwarf-fortress/default.nix | 8 +++++--- pkgs/games/extremetuxracer/default.nix | 2 +- pkgs/games/hedgewars/default.nix | 6 +++--- pkgs/games/jamp/default.nix | 2 +- pkgs/games/liquidwar/default.nix | 2 +- pkgs/games/quantumminigolf/default.nix | 2 +- pkgs/games/rili/default.nix | 2 +- pkgs/games/thePenguinMachine/default.nix | 2 +- pkgs/games/trackballs/default.nix | 2 +- pkgs/games/ultrastardx/default.nix | 2 +- pkgs/games/zdoom/default.nix | 4 ++-- 13 files changed, 20 insertions(+), 18 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index b36ec6a43f6..cfb276c0fb0 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { 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_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework OpenGL -framework Cocoa"; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 57cd67fbb7b..82e5ddb06d4 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.linux"; - NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; NIX_LDFLAGS = "-lGL"; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4ddc664ec1d..b804adb562b 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { sourceRoot = srcs.df_unfuck.name; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; permission = ./df_permission; @@ -85,7 +85,9 @@ stdenv.mkDerivation rec { done # 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_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index af80467c960..f2417428880 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" ]; 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 = { diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index f5d4627c5c0..9909c042814 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { -rpath ${SDL_mixer}/lib -rpath ${SDL_net}/lib -rpath ${SDL_ttf}/lib - -rpath ${SDL}/lib - -rpath ${libpng}/lib + -rpath ${SDL.out}/lib + -rpath ${libpng.out}/lib -rpath ${lua5_1}/lib -rpath ${mesa}/lib - -rpath ${zlib}/lib + -rpath ${zlib.out}/lib " ''; diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix index be7abc75915..0fbd79e77b0 100644 --- a/pkgs/games/jamp/default.nix +++ b/pkgs/games/jamp/default.nix @@ -16,7 +16,7 @@ rec { preBuild = a.fullDepEntry ('' sed -e "s@/usr/games@$out/bin@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"]; /* doConfigure should be removed if not needed */ diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 602daa1ee86..a87c4dea0c3 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -30,7 +30,7 @@ rec { phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; 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 = { diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 94035179016..1b075507796 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; 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 ''; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index fbf47653af9..a1ca93a828b 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./moderinze_cpp.patch ]; 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 ''; diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 479004a9af4..9089b58bd53 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [python pil pygame SDL]; 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; cat setup.py; export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 22d8c944fa8..7cf741f2fab 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postUnpack = optionalString debug "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"; patchPhase = '' diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 3eabaa090bb..5027abedcf4 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # 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. 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 ''; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index 0bc63855299..de0f9c4db83 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-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 = '' sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h -- cgit 1.4.1