diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/package-management/nixops | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixpkgs-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/tools/package-management/nixops')
| -rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index f392e0f50ed..da62eba63fd 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -1,4 +1,4 @@ -{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh +{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh # version args , src, version }: @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication { doCheck = false; postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man mkdir -p $out/share/nix/nixops |