about summary refs log tree commit diff
path: root/release.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-04-15 18:29:58 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-04-15 18:29:58 +0200
commit40d5244cf3842282aef0a1c19c7bdb508677baae (patch)
tree227fcf047d0abf7ca557e533523b243aca4837d7 /release.nix
parentde8c767c832cdf79fc66d552966706140c1cb067 (diff)
release.nix: Fix evaluation of manual.
Regression introduced by a610560bb4b5a05eb480a4dbab3e24c553727047.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'release.nix')
-rw-r--r--release.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/release.nix b/release.nix
index ef42bc84..0632b1c3 100644
--- a/release.nix
+++ b/release.nix
@@ -42,10 +42,10 @@ in with pkgsUpstream.lib; with builtins; {
     filterDoc = filter (opt: isVuizvui opt && opt.visible && !opt.internal);
     optionsXML = toXML (filterDoc (optionAttrSetToDocList modules.options));
     optionsFile = toFile "options.xml" (unsafeDiscardStringContext optionsXML);
-  in pkgs.stdenv.mkDerivation {
+  in pkgsUpstream.stdenv.mkDerivation {
     name = "vuizvui-options";
 
-    buildInputs = singleton pkgs.libxslt;
+    buildInputs = singleton pkgsUpstream.libxslt;
 
     xsltFlags = ''
       --param section.autolabel 1
@@ -73,7 +73,7 @@ in with pkgsUpstream.lib; with builtins; {
       XML
 
       xsltproc -o "$out/manual.html" $xsltFlags -nonet -xinclude \
-        ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
+        ${pkgsUpstream.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
         manual.xml
 
       cp "${<nixpkgs/nixos/doc/manual/style.css>}" "$out/style.css"