diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2020-07-01 11:24:01 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2020-07-01 11:32:08 -0300 |
commit | 5f21dfd306093a86f60698d1e49acdf25cce6dd0 (patch) | |
tree | 34f52f348dccba978bd09a244264704767d37da1 | |
parent | 07eef329b2a32913b3cab6bd19be6cd6397bd5df (diff) |
tint2: format with nixpkgs-fmt
Also: - use pkg-config instead of pkgconfig - do not explicitly enable parallel building, as its automatically enabled for cmake projects
-rw-r--r-- | pkgs/applications/misc/tint2/default.nix | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index dc991402eec63..242a4e76c05ad 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,25 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage -, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, wrapGAppsHook +{ stdenv +, fetchFromGitLab +, pkg-config +, cmake +, gettext +, cairo +, pango +, pcre +, glib +, imlib2 +, gtk2 +, libXinerama +, libXrender +, libXcomposite +, libXdamage +, libX11 +, libXrandr +, librsvg +, libpthreadstubs +, libXdmcp +, libstartup_notification +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,13 +33,31 @@ stdenv.mkDerivation rec { sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + pkg-config + cmake + gettext + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - - buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender - libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification ]; + buildInputs = [ + cairo + pango + pcre + glib + imlib2 + gtk2 + libXinerama + libXrender + libXcomposite + libXdamage + libX11 + libXrandr + librsvg + libpthreadstubs + libXdmcp + libstartup_notification + ]; postPatch = '' for f in ./src/launcher/apps-common.c \ |