Merge remote-tracking branch 'lass/master'

3 files changed, 17 insertions, 0 deletions

diff --git a/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/default.nix b/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/default.nix
new file mode 100644
index 000000000..d2f6f46b2
--- /dev/null
+++ b/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/default.nix
@@ -0,0 +1,16 @@
+# This package is mainly intended for cross-built systems for which we cannot
+# or don't want to build pkgs.rxvt_unicode for some reason.
+#
+# ${./rxvt-unicode-256color.terminfo} was copied from a previously built
+# /run/current-system/sw/share/terminfo/r/rxvt-unicode-256color
+{ runCommand }:
+
+runCommand "rxvt-unicode-256color-terminfo" {} /* sh */ ''
+  mkdir -p $out/nix-support
+  mkdir -p $out/share/terminfo/r
+
+  ln -s ${./rxvt-unicode-256color.terminfo} \
+      $out/share/terminfo/r/rxvt-unicode-256color
+
+  echo "$out" >> $out/nix-support/propagated-user-env-packages
+''
diff --git a/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/rxvt-unicode-256color.terminfo b/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/rxvt-unicode-256color.terminfo
new file mode 100644
index 000000000..3f43d0d56
--- /dev/null
+++ b/tv/5pkgs/simple/rxvt-unicode-256color-terminfo/rxvt-unicode-256color.terminfo
diff --git a/tv/5pkgs/simple/viljetic-pages/default.nix b/tv/5pkgs/simple/viljetic-pages/default.nix
index 1ae55cca7..ee07c9277 100644
--- a/tv/5pkgs/simple/viljetic-pages/default.nix
+++ b/tv/5pkgs/simple/viljetic-pages/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out
     cp ${./index.html} $out/index.html
+    convert ${./logo.xpm} $out/favicon.ico
     convert ${./logo.xpm} $out/favicon2.png
   '';
 }