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

treewide: Make explicit that 'dev' output of glib is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:57:59 +03:00 committed by Damien Cassou
parent ed9f4e16f3
commit 8cad701fc5
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; 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; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Cheese; homepage = https://wiki.gnome.org/Apps/Cheese;

2
pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = '' 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') 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')
''; '';

2
pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
# this should probably be setuphook for glib # 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; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
# fatal error: gio/gunixfdlist.h: No such file or directory # 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; buildInputs = with gnome3;
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager

2
pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name mkdir -p $out/share/gsettings-schemas/$name
mv $out/share/glib-2.0 $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 = '' preFixup = ''

2
pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
mkdir -p "$schemas_dir" mkdir -p "$schemas_dir"
mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ 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" locale_dir="$share_dir/locale"
mkdir -p "$locale_dir" mkdir -p "$locale_dir"