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

glib: 2.52.3 -> 2.54.0

Browse Source 
License was updated upstream.  Also tidy the expression a bit,
and unify the nix coding style.
This commit is contained in:
Vladimír Čunát 2017-09-17 16:59:15 +02:00
parent b4be1cb8e0
commit 00b4e2646c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.52";
ver_min = "3";
ver_maj = "2.54";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -51,10 +51,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a";
};
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;
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
@ -76,19 +77,21 @@ stdenv.mkDerivation rec {
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
++ optional stdenv.isSunOS "--disable-dtrace";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+ optionalString stdenv.isSunOS " -DBSD_COMP";
NIX_CFLAGS_COMPILE = optional stdenv.isDarwin "-lintl"
++ optional stdenv.isSunOS "-DBSD_COMP";
preConfigure = if !stdenv.isSunOS then null else
''
preConfigure = optionalString stdenv.isSunOS ''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
'';
postConfigure = ''
patchShebangs ./gobject/
'';
LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
preBuild = optionalString stdenv.isDarwin
''
preBuild = optionalString stdenv.isDarwin ''
export MACOSX_DEPLOYMENT_TARGET=
'';
@ -107,16 +110,19 @@ stdenv.mkDerivation rec {
'';
inherit doCheck;
preCheck = optionalString doCheck
'' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP"
export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
export PATH="$PATH:$(pwd)/gobject"
echo "PATH=$PATH"
substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop \
--replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
# Needs machine-id, comment the test
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c
@ -136,7 +142,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C library of programming buildings blocks";
homepage = https://www.gtk.org/;
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;