From ec0126de09abcbebe45f7ba3e4865be716ebae81 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 21 Dec 2021 12:12:33 +0100 Subject: [PATCH] forktty: refactor --- pkgs/os-specific/linux/forktty/default.nix | 39 ++++++++----------- .../linux/forktty/default.upstream | 2 - 2 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 pkgs/os-specific/linux/forktty/default.upstream diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index c2e493995829..f060557cdecd 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 45cb775a0ae3..000000000000 --- 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'