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
This commit is contained in:
Matthew Bauer
2018-07-18 23:25:20 -04:00
parent d7d31fea7e
commit 76999cc40e
167 changed files with 460 additions and 445 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
, openal, libudev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, polarssl
, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls
, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin
@@ -36,10 +36,10 @@ in stdenv.mkDerivation rec {
buildInputs = [
curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb libpng hidapi miniupnpc enet polarssl soundtouch sfml
portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
qt5.qtbase
] ++ stdenv.lib.optionals stdenv.isLinux [
bluez libudev libevdev alsaLib vulkan-loader
bluez udev libevdev alsaLib vulkan-loader
] ++ stdenv.lib.optionals stdenv.isDarwin [
CoreBluetooth cf-private OpenGL ForceFeedback IOKit
];
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, retroarch
, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis
, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
, miniupnpc, sfml, xorg, zlib }:
let
@@ -149,7 +149,7 @@ in with stdenv.lib.licenses;
extraBuildInputs = [
cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc
gettext glib gtk2 hidapi
libevdev libudev
libevdev udev
] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
}).override {
cmakeFlags = [