treewide: Make explicit that 'dev' output of glib is used
This commit is contained in:
parent
ed9f4e16f3
commit
8cad701fc5
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Cheese;
|
||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
|
||||
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
|
||||
|
||||
gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
|
||||
'';
|
||||
|
|
|
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
|
|||
inherit (import ./src.nix fetchurl) name src;
|
||||
|
||||
# this should probably be setuphook for glib
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
|||
inherit (import ./src.nix fetchurl) name src;
|
||||
|
||||
# fatal error: gio/gunixfdlist.h: No such file or directory
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
buildInputs = with gnome3;
|
||||
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
|
||||
|
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
mkdir -p $out/share/gsettings-schemas/$name
|
||||
mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
|
||||
${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
|
||||
${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
|
||||
mkdir -p "$schemas_dir"
|
||||
mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
|
||||
${glib}/bin/glib-compile-schemas "$schemas_dir"
|
||||
${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
|
||||
|
||||
locale_dir="$share_dir/locale"
|
||||
mkdir -p "$locale_dir"
|
||||
|
|
Loading…
Reference in a new issue