diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-06-11 12:36:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-11 12:36:39 +0200 |
commit | f4fdc8b06b2560570f01734abdad234392104adc (patch) | |
tree | 88d30b262dcc496c38d5db8b222e4bf86d5ca117 /pkgs | |
parent | ed657a98c76a427d9c6a485ecb912386f6157a5d (diff) | |
parent | 2443a602de62b6735e40daaf3d8e52fcef68716c (diff) | |
download | nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar.gz nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar.bz2 nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar.lz nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar.xz nixlib-f4fdc8b06b2560570f01734abdad234392104adc.tar.zst nixlib-f4fdc8b06b2560570f01734abdad234392104adc.zip |
Merge pull request #41827 from jtojnar/libgtop-darwin
libgtop: fix darwin build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libgtop/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index 656395b8867d..6498014aee8d 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, gnome3 }: +{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }: let pname = "libgtop"; version = "2.38.0"; @@ -11,8 +11,20 @@ stdenv.mkDerivation rec { sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; }; + patches = [ + # Fix darwin build + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch; + sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn"; + }) + ]; + propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig perl gettext gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobjectIntrospection ]; + + preConfigure = '' + ./autogen.sh + ''; passthru = { updateScript = gnome3.updateScript { @@ -24,6 +36,6 @@ stdenv.mkDerivation rec { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } |