summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/applications/video/avidemux/default.nix2
-rw-r--r--pkgs/applications/video/gnash/default.nix2
-rw-r--r--pkgs/development/interpreters/love/default.nix2
-rw-r--r--pkgs/development/libraries/SDL/default.nix5
-rw-r--r--pkgs/development/libraries/smpeg/default.nix2
-rw-r--r--pkgs/games/beret/default.nix2
-rw-r--r--pkgs/games/bitsnbots/default.nix2
-rw-r--r--pkgs/games/dwarf-fortress/default.nix8
-rw-r--r--pkgs/games/extremetuxracer/default.nix2
-rw-r--r--pkgs/games/hedgewars/default.nix6
-rw-r--r--pkgs/games/jamp/default.nix2
-rw-r--r--pkgs/games/liquidwar/default.nix2
-rw-r--r--pkgs/games/quantumminigolf/default.nix2
-rw-r--r--pkgs/games/rili/default.nix2
-rw-r--r--pkgs/games/thePenguinMachine/default.nix2
-rw-r--r--pkgs/games/trackballs/default.nix2
-rw-r--r--pkgs/games/ultrastardx/default.nix2
-rw-r--r--pkgs/games/zdoom/default.nix4
-rw-r--r--pkgs/misc/emulators/retroarch/cores.nix2
-rw-r--r--pkgs/tools/graphics/quirc/default.nix2
20 files changed, 30 insertions, 25 deletions
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 96ead862e0e3..3b48a447f6ff 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" +
" -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
- " -DSDL_INCLUDE_DIR=${SDL}/include/SDL";
+ " -DSDL_INCLUDE_DIR=${SDL.dev}/include/SDL";
NIX_LDFLAGS="-lpthread";
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 615e0c7e568f..0200b0c70f4e 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
preConfigure =
'' configureFlags=" \
- --with-sdl-incl=${SDL}/include/SDL \
+ --with-sdl-incl=${SDL.dev}/include/SDL \
--with-npapi-plugindir=$out/plugins \
--enable-media=gst \
--without-gconf
diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix
index fc1f01cb3730..b12c2c405780 100644
--- a/pkgs/development/interpreters/love/default.nix
+++ b/pkgs/development/interpreters/love/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
NIX_CFLAGS_COMPILE = ''
- -I${SDL}/include/SDL
+ -I${SDL.dev}/include/SDL
-I${freetype}include/freetype2
'';
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 070cf76da6d9..0a1e1a3e89af 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
};
- outputs = [ "out" "man" ];
+ outputs = [ "dev" "out" "man" ];
+ outputBin = "dev"; # sdl-config
nativeBuildInputs = [ pkgconfig ];
@@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
}) ];
+ postFixup = ''_moveToOutput share/aclocal "$dev" '';
+
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
patches = let
f = rev: sha256: fetchurl {
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index c2473ae2c5db..2f300abebbf1 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/smpeg-config \
--prefix PATH ":" "${pkgconfig}/bin" \
- --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig"
+ --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
'';
meta = {
diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix
index b36ec6a43f69..cfb276c0fb06 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 57cd67fbb7ba..82e5ddb06d4d 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 4ddc664ec1d4..b804adb562b2 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 af80467c960d..f2417428880c 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 f5d4627c5c08..9909c0428144 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 be7abc75915d..0fbd79e77b00 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 602daa1ee864..a87c4dea0c37 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 940351790166..1b0755077965 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 fbf47653af99..a1ca93a828b4 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 479004a9af4d..9089b58bd533 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 22d8c944fa8b..7cf741f2faba 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 3eabaa090bb0..5027abedcf4f 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 0bc63855299e..de0f9c4db831 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
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 01670ca4688e..f5e69a710bb9 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -182,7 +182,7 @@ in
extraBuildInputs = [ libpng SDL ];
}).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";
};
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index d84989d4372b..6da565b292f9 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchgit {
inherit (s) url sha256 rev;
};
- NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL";
+ NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL";
configurePhase = ''
sed -e 's/-[og] root//g' -i Makefile
'';
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 12:12:10 +0000