diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:57:59 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:35 +0200 |
| commit | f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf (patch) | |
| tree | 5e2eff49487832284d4a0a44ca3280b2a7b92805 /pkgs/applications | |
| parent | a11b717ce4df4c3748c2c37c2623f9735e332e14 (diff) | |
| download | nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar.gz nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar.bz2 nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar.lz nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar.xz nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.tar.zst nixpkgs-f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf.zip | |
treewide: Make explicit that 'dev' output of glib is used
Diffstat (limited to 'pkgs/applications')
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 94094a149c9..2d3e95335cd 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -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" ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 01c267cbbb4..0048cb73878 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -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)" diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 22cdc84b286..143448b346a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -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" diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index e31ed7e509c..9e04cdf3825 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -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 diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a5decf21360..cdd406c42c9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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 |