diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2020-07-02 13:27:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-02 13:27:15 +0200 |
commit | d2fd80877accad61ff1371ef77a7bbdbfb2aab2e (patch) | |
tree | c5d9e628605af61aa07c73faa24b2e716072aac5 /pkgs/applications/misc | |
parent | c925ad564c3138b54f87eb02d70f49b3881e43a1 (diff) | |
parent | 5c021a4bbd813a98de960e2e804425f69f559a74 (diff) |
Merge pull request #91949 from romildo/fix.tint2
tint2: fix doc directory
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/tint2/default.nix | 58 |
1 files changed, 49 insertions, 9 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index dc991402eec63..326dd3c0d92a1 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,35 @@ 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 ]; + cmakeFlags = [ + "-Ddocdir=share/doc/${pname}" + ]; postPatch = '' for f in ./src/launcher/apps-common.c \ |