diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/development/libraries/libgtop | |
parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libgtop')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libgtop/default.nix | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/nixpkgs/pkgs/development/libraries/libgtop/default.nix index fcc76938b3ed..fe7986bf21aa 100644 --- a/nixpkgs/pkgs/development/libraries/libgtop/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgtop/default.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }: -let - pname = "libgtop"; - version = "2.38.0"; -in +{ stdenv +, fetchurl +, glib +, pkgconfig +, perl +, gettext +, gobject-introspection +, gnome3 +, gtk-doc +}: + stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "libgtop"; + version = "2.40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; }; - patches = [ - # Fix darwin build - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch; - sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn"; - }) + nativeBuildInputs = [ + pkgconfig + gtk-doc + perl + gettext + gobject-introspection ]; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ]; - - preConfigure = '' - ./autogen.sh - ''; + propagatedBuildInputs = [ + glib + ]; passthru = { updateScript = gnome3.updateScript { |