From 85b236e54a446ea136ca539c7bb3b36591e4cc08 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 21 Feb 2021 11:08:32 +0100 Subject: [PATCH] bdf2psf: fix license, run pre/post hooks --- pkgs/tools/misc/bdf2psf/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 9da0933f94b..1a782661466 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -14,10 +14,16 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; installPhase = " + runHook preInstall substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl mv usr $out + runHook postInstall "; meta = with lib; { @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { longDescription = '' Font converter to generate console fonts from BDF source fonts ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rnhmjoj vrthra ]; platforms = platforms.unix; };