From 778c776ab6b96d2c8031790bf8d6755bb4f3aea1 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 30 May 2021 11:07:31 +0100 Subject: [PATCH] quartus: formatting fixes from review Co-authored-by: Sandro --- pkgs/applications/editors/quartus-prime/default.nix | 7 ++++--- pkgs/applications/editors/quartus-prime/quartus.nix | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 05cc97d8667..773b1f278e0 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript, - supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , - unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } }: +{ stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } +}: let desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 1ec862d666f..9475f441703 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, unstick, requireFile, - supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: +{ stdenv, lib, unstick, requireFile +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +}: let deviceIds = { @@ -85,12 +86,12 @@ in stdenv.mkDerivation rec { rm -r $out/uninstall $out/logs ''; - meta = { + meta = with lib; { inherit homepage; description = "FPGA design and simulation software"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; + license = licenses.unfree; + platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore - maintainers = with lib.maintainers; [ kwohlfahrt ]; + maintainers = with maintainers; [ kwohlfahrt ]; }; }