summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-07-02 14:10:26 +0200
committerGitHub <noreply@github.com>2016-07-02 14:10:26 +0200
commit24b3fa1ae6e140f10b14f357d54d525ad35cfda1 (patch)
tree7483b6debad82df71bf9045491a483841eca6932
parent732fb03633dc1563225f126ee3d9032d0e47c62f (diff)
parentd60a41053ea78ef23bf559f9226faff7132c0c2b (diff)
downloadnixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar.gz
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar.bz2
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar.lz
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar.xz
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.tar.zst
nixlib-24b3fa1ae6e140f10b14f357d54d525ad35cfda1.zip
Merge pull request #16560 from vrthra/dvtm-customize
dvtm: allow user configuration
-rw-r--r--pkgs/tools/misc/dvtm/default.nix14
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index f973f3d22645..767912ecc454 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, customConfig ? null }:
 
 stdenv.mkDerivation rec {
+
   name = "dvtm-0.15";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Dynamic virtual terminal manager";
     homepage = http://www.brain-dump.org/projects/dvtm;
-    license = stdenv.lib.licenses.mit;
-    platfroms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    platfroms = platforms.linux;
+    maintainers = [ maintainers.vrthra ];
   };
 
   src = fetchurl {
@@ -15,6 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
   };
 
+  postPatch = stdenv.lib.optionalString (customConfig != null) ''
+    cp ${builtins.toFile "config.h" customConfig} ./config.h
+  '';
+
   buildInputs = [ ncurses ];
 
   prePatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6737b67a00e6..7b22257c6492 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1376,7 +1376,11 @@ in
 
   dvgrab = callPackage ../tools/video/dvgrab { };
 
-  dvtm = callPackage ../tools/misc/dvtm { };
+  dvtm = callPackage ../tools/misc/dvtm {
+    # if you prefer a custom config, write the config.h in dvtm.config.h
+    # and enable
+    # customConfig = builtins.readFile ./dvtm.config.h;
+  };
 
   e2tools = callPackage ../tools/filesystems/e2tools { };