From 3b08d97e071ee86e113b915f6bbeb9d9c9b98f15 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:29:21 -0500 Subject: [PATCH] nixpkgs: simplify arachne-pnr makeFlags, make myself maintainer Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 6508b05a534..0a0f8bbf082 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; }; - preBuild = '' - makeFlags="DESTDIR=$out $makeFlags" - ''; - makeFlags = "ICEBOX=${icestorm}/share/icebox"; + makeFlags = + [ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox" + ]; meta = { description = "Place and route tool for FPGAs"; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cseed/arachne-pnr; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.shell ]; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; }