diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
commit | c4661e96434118637a5c41511a6c7f015726396f (patch) | |
tree | edd7a4026fd903cddfb32b27f629af7f5c110fa8 /pkgs/applications/misc | |
parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) | |
download | nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.gz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.bz2 nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.lz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.xz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.zst nixlib-c4661e96434118637a5c41511a6c7f015726396f.zip |
Merge: make dev output references explicit
This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/apvlv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/diffpdf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/fetchmail/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/garmin-plugin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/gkrellm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/mrxvt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/pinfo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/xautoclick/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index aa312f4c8a90..88e08b409146 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler" ''; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3b8ab7f07f3c..46f4e8635a93 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${poppler_utils}/include/poppler + export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 666c3a40cdcc..fd3d0b35729e 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 2c9aaeda98fe..4cec2ca41b67 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - configureFlags = "--with-ssl=${openssl}"; + configureFlags = "--with-ssl=${openssl.dev}"; meta = { homepage = "http://www.fetchmail.info/"; diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 613c56efcfda..e2c9bf49459b 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "GarminPlugin-0.3.26/src"; buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ]; configureFlags = [ - "--with-libgcrypt-prefix=${libgcrypt}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" "--with-garmintools-libdir=${garmintools}/lib" ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 934a7c69c993..ac8f876ad3fc 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { echo "patching makefiles..." for i in Makefile src/Makefile server/Makefile do - sed -i "$i" -e "s|/usr/X11R6|${libX11}|g ; s|-lICE|-lX11 -lICE|g" + sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" done ''; buildPhase = '' 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/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 222dddc0e897..9753e6d44755 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; - configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline}" ]; + configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; meta = with stdenv.lib; { description = "A viewer for info files"; 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 diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 49a94ac39797..611527153ee5 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals gtkSupport [ gtk ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' - substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11} + substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} ''; preConfigure = stdenv.lib.optional qtSupport '' mkdir .bin diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 01c267cbbb44..0048cb738782 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)" |