colin/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 Vladimír Čunát
parent a11b717ce4
commit f81af4e6f0
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -44,7 +44,7 @@ let
${cfg.extraGSettingsOverrides}
EOF
${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
'';
};

2
pkgs/applications/graphics/shotwell/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
configureFlags = [ "--disable-gsettings-convert-install" ];

2
pkgs/applications/misc/zathura/core/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ];
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [
"PREFIX=$(out)"

2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
"DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"
"DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
"INCLUDEPATH+=${glib}/include/glib-2.0"
"INCLUDEPATH+=${glib.dev}/include/glib-2.0"
"INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"
"INCLUDEPATH+=${cairo.dev}/include/cairo"
"INCLUDEPATH+=${pango}/include/pango-1.0"

2
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -39,7 +39,7 @@ buildPythonApplication rec {
'';
postInstall = ''
${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
'';
# Failed tests

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -133,7 +133,7 @@ in stdenv.mkDerivation {
${optionalString (!pulseSupport) "--disable-pulse"} \
${optionalString (!enableHardening) "--disable-hardening"} \
--disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk
sed -e 's@arch/x86/@@' \
-i Config.kmk

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

@ -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;

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

@ -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')
'';

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

@ -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;

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

@ -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

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

@ -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 = ''

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

@ -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"

2
pkgs/development/libraries/zeitgeist/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
configureScript = "./autogen.sh";