From f3e951814972f05b0ab9c1ee0ee7cbfa7c12e8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Jul 2020 14:06:21 +0200 Subject: [PATCH] dpic: cleanup derivation, install man pages - Use configure, since upstream provides it. - Rely on `make install` to install dpic. - This also installs the man pages. --- pkgs/tools/graphics/dpic/default.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 0bcac70e4b7f..7b7eea3d5095 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + # The prefix passed to configure is not used. + makeFlags = [ "DESTDIR=$(out)" ]; - makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; - - installPhase = '' - mkdir -p $out/bin - cp -fv dpic $out/bin - ''; - - meta = { - homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + meta = with stdenv.lib; { description = "An implementation of the pic little language for creating drawings"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.aespinosa ]; - platforms = stdenv.lib.platforms.all; + homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + license = licenses.bsd2; + maintainers = with maintainers; [ aespinosa ]; + platforms = platforms.all; }; }