dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

glib: 2.62.4 -> 2.64.1

Browse Source 
gio-launch-desktop is replaced by direct /bin/sh calls
This commit is contained in:
Tor Hedin Brønner 2020-02-09 00:09:08 +01:00 committed by Jan Tojnar
parent 96586d4e4b
commit 19d2e3c4d9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,11 +48,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "glib"; pname = "glib";
version = "2.62.5"; version = "2.64.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq"; sha256 = "1ixvjmsrj45xq9bq3chhj98jhgcsqa08v627mjx6sjxlph1pd5hp";
}; };
patches = optionals stdenv.isDarwin [ patches = optionals stdenv.isDarwin [
@ -62,8 +62,6 @@ stdenv.mkDerivation rec {
./gobject_init_on_demand.patch ./gobject_init_on_demand.patch
] ++ [ ] ++ [
./schema-override-variable.patch ./schema-override-variable.patch
# Require substituteInPlace in postPatch
./fix-gio-launch-desktop-path.patch
# GLib contains many binaries used for different purposes; # GLib contains many binaries used for different purposes;
# we will install them to different outputs: # we will install them to different outputs:
@ -126,9 +124,6 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
# substitute fix-gio-launch-desktop-path.patch
substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"
chmod +x gio/tests/gengiotypefuncs.py chmod +x gio/tests/gengiotypefuncs.py
patchShebangs gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py
chmod +x docs/reference/gio/concat-files-helper.py chmod +x docs/reference/gio/concat-files-helper.py
@ -148,11 +143,6 @@ stdenv.mkDerivation rec {
# This file is *included* in gtk3 and would introduce runtime reference via __FILE__. # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'' + optionalString (!stdenv.isDarwin) ''
# Add gio-launch-desktop to $out so we can refer to it from $lib
mkdir $out/bin
mv "$bin/bin/gio-launch-desktop" "$out/bin/"
ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
'' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
cp -r ${buildPackages.glib.devdoc} $devdoc cp -r ${buildPackages.glib.devdoc} $devdoc
''; '';

11
pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
View File

@ -1,11 +0,0 @@
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
/* Fall back on usual searching in $PATH */
if (tmp == NULL)
- tmp = "gio-launch-desktop";
+ tmp = "@bindir@/gio-launch-desktop";
g_once_init_leave (&gio_launch_desktop_path, tmp);
}