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
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
libevdev, libudev }:
libevdev, udev }:
let
version = "0.1.1";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevdev libudev libyamlcpp ];
buildInputs = [ libevdev udev libyamlcpp ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace \
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl
, vala, gobjectIntrospection, intltool, python2Packages, glib
, pkgconfig
, libgee, json_glib, marisa, libkkc-data
, libgee, json-glib, marisa, libkkc-data
}:
stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ marisa libkkc-data ];
enableParallelBuilding = true;
propagatedBuildInputs = [ libgee json_glib ];
propagatedBuildInputs = [ libgee json-glib ];
postInstall = ''
ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models