libogg: fix splitting and some referrers

pkgs/development/libraries/libogg/default.nix

@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
   meta = with stdenv.lib; {
-
-  outputs = [ "dev" "doc" "out" ];
     homepage = http://xiph.org/ogg/;
     license = licenses.bsd3;
     maintainers = [ maintainers.emery ];

pkgs/games/nexuiz/default.nix

@@ -36,14 +36,14 @@ in stdenv.mkDerivation {
   '';
 
   NIX_LDFLAGS = ''
-    -rpath ${zlib}/lib
+    -rpath ${zlib.out}/lib
-    -rpath ${curl}/lib
+    -rpath ${curl.out}/lib
-    -rpath ${libjpeg}/lib
+    -rpath ${libjpeg.out}/lib
-    -rpath ${libpng}/lib
+    -rpath ${libpng.out}/lib
-    -rpath ${libvorbis}/lib
+    -rpath ${libvorbis.out}/lib
-    -rpath ${libtheora}/lib
+    -rpath ${libtheora.out}/lib
-    -rpath ${libogg}/lib
+    -rpath ${libogg.out}/lib
-    -rpath ${libmodplug}/lib
+    -rpath ${libmodplug.out}/lib
   '';
 
   buildPhase = ''

pkgs/games/openarena/default.nix

@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   installPhase = let
     gameDir = "$out/openarena-$version";
     interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
+    libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ];
   in ''
     mkdir -pv $out/bin
     cd $out
@@ -23,11 +24,11 @@ stdenv.mkDerivation rec {
     ${if stdenv.system == "x86_64-linux" then ''
       patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64"
       makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \
-        --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib"
+        --prefix LD_LIBRARY_PATH : "${libPath}"
     '' else ''
       patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386"
       makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \
-        --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib"
+        --prefix LD_LIBRARY_PATH : "${libPath}"
     ''}
   '';