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

glib: bin/gio is required by gvfs executables 

this fixes gvfs in caia (mate desktop)
This commit is contained in:
Jörg Thalheim 2018-04-05 21:12:18 +01:00
parent f55a6ab844
commit 9d6ac12f39
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
++ optional doCheck ./skip-timer-test.patch ++ optional doCheck ./skip-timer-test.patch
++ [ ./schema-override-variable.patch ]; ++ [ ./schema-override-variable.patch ];
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "bin" "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
@ -106,12 +106,16 @@ stdenv.mkDerivation rec {
DETERMINISTIC_BUILD = 1; DETERMINISTIC_BUILD = 1;
postInstall = '' postInstall = ''
mkdir -p $bin/bin
for app in gapplication gdbus gio gsettings; do
mv "$dev/bin/$app" "$bin/bin"
done
moveToOutput "share/glib-2.0" "$dev" moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
''
# 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 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ sed '1i#line 1 "${name}/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
''; '';