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:
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user