summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Buehler <account@buehler.rocks>2021-12-21 12:12:33 +0100
committerFelix Buehler <account@buehler.rocks>2021-12-21 12:12:33 +0100
commitec0126de09abcbebe45f7ba3e4865be716ebae81 (patch)
tree70b8b3634522421305a751c085c5a76d0169ca7c
parent459f9fe2bea3546a95002dcfe2aa55b1e4d6bef9 (diff)
downloadnixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar.gz
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar.bz2
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar.lz
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar.xz
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.tar.zst
nixpkgs-ec0126de09abcbebe45f7ba3e4865be716ebae81.zip
forktty: refactor
-rw-r--r--pkgs/os-specific/linux/forktty/default.nix39
-rw-r--r--pkgs/os-specific/linux/forktty/default.upstream2
2 files changed, 16 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix
index c2e49399582..f060557cdec 100644
--- a/pkgs/os-specific/linux/forktty/default.nix
+++ b/pkgs/os-specific/linux/forktty/default.nix
@@ -1,36 +1,29 @@
-{lib, stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="forktty";
-    version="1.3";
-    name="${baseName}-${version}";
-    hash="0nd55zdqly6nl98k9lc7j751x86cw9hayx1qn0725f22r1x3j5zb";
-    url="http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-1.3.tgz";
-    sha256="0nd55zdqly6nl98k9lc7j751x86cw9hayx1qn0725f22r1x3j5zb";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "forktty";
+  version = "1.3";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz";
+    sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk=";
   };
+
   preBuild = ''
     sed -e s@/usr/bin/ginstall@install@g -i Makefile
   '';
+
   preInstall = ''
     mkdir -p "$out/bin"
     mkdir -p "$out/share/man/man8"
   '';
+
   makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ];
-  meta = {
-    inherit (s) version;
+
+  meta = with lib; {
     description = "Tool to detach from controlling TTY and attach to another";
-    license = lib.licenses.gpl2 ;
-    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/forktty/default.upstream b/pkgs/os-specific/linux/forktty/default.upstream
deleted file mode 100644
index 45cb775a0ae..00000000000
--- a/pkgs/os-specific/linux/forktty/default.upstream
+++ /dev/null
@@ -1,2 +0,0 @@
-url http://sunsite.unc.edu/pub/linux/utils/terminal/
-version_link 'forktty.*tgz'