diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:52:29 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:34 +0200 |
commit | 288912c2c44279e91bca635c5a99cced5347fbd0 (patch) | |
tree | 36129f12869feab620ec7e8eaef07693900a7e37 /pkgs/applications | |
parent | b51b458aed2241a23f8b5bf195e328753eb6998a (diff) | |
download | nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar.gz nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar.bz2 nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar.lz nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar.xz nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.tar.zst nixlib-288912c2c44279e91bca635c5a99cced5347fbd0.zip |
treewide: Make explicit that 'dev' output of freetype is used
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/display-managers/slim/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/mrxvt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index c77102629885..fca84199e511 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PAM=1" ]; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11"; + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index b11b234eb43d..e8bf2f7a14c8 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"; + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; src = fetchurl { diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 5d1eda5ec063..8fbe021cc8f7 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (rec { mkdir -p $terminfo/share/terminfo configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " '' # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically |