public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18849 from groxxda/glib 

glib: 2.48.2 -> 2.50.0 [-> staging]
This commit is contained in:
Luca Bruno 2016-09-22 21:40:30 +01:00 committed by GitHub
parent 7a4209c356 868eb83019
commit 3e0132f0f9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/glib/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, python { stdenv, fetchurl, pkgconfig, gettext, perl, python
, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf , libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
# this is just for tests (not in closure of any regular package) # this is just for tests (not in closure of any regular package)
, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false , coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
@ -8,6 +10,7 @@
with stdenv.lib; with stdenv.lib;
assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU;
assert stdenv.isLinux -> utillinuxMinimal != null;
# TODO: # TODO:
# * Add gio-module-fam # * Add gio-module-fam
@ -39,8 +42,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
''; '';
ver_maj = "2.48"; ver_maj = "2.50";
ver_min = "2"; ver_min = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -48,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"; sha256 = "830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70";
}; };
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = [ libelf setupHook pcre ] buildInputs = [ libelf setupHook pcre ]
++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount
++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
nativeBuildInputs = [ pkgconfig gettext perl python ]; nativeBuildInputs = [ pkgconfig gettext perl python ];