summary refs log tree commit diff
path: root/pkgs/desktops/gnustep
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/desktops/gnustep
parentd7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff)
downloadnixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst
nixpkgs-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip
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/desktops/gnustep')
-rw-r--r--pkgs/desktops/gnustep/back/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 7920c8e1f45..ed162229d9a 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -2,7 +2,7 @@
 , cairo
 , fetchurl
 , base, gui
-, x11
+, xlibsWrapper
 , freetype
 , pkgconfig
 , libXmu
@@ -17,7 +17,7 @@ gsmakeDerivation {
     sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cairo base gui freetype x11 libXmu ];
+  buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ];
   meta = {
     description = "A generic backend for GNUstep";
   };