about summary refs log tree commit diff
path: root/pkgs/games/openrw
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-17 16:11:16 -0400
committerMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-18 23:25:20 -0400
commit76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch)
tree0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/games/openrw
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
Diffstat (limited to 'pkgs/games/openrw')
-rw-r--r--pkgs/games/openrw/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 5a8a8d244bf6d..63fb24dc4d7de 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal
+{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
 , SDL2, boost, ffmpeg }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg
+    cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
   ];
 
   meta = with stdenv.lib; {