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
This commit is contained in:
José Romildo Malaquias 2020-07-01 11:24:01 -03:00
parent 07eef329b2
commit 5f21dfd306

View file

@ -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 \