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/editors | |
| parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
| parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) | |
| download | nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.gz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.bz2 nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.lz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.xz nixpkgs-c4661e96434118637a5c41511a6c7f015726396f.tar.zst nixpkgs-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/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs-25/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/texmaker/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 019015785e6..eaadd985be7 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "--with-gif=no" "--with-tiff=no" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; preBuild = '' find . -name '*.elc' -delete diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 83165f0a505..f4d9d4ccdd5 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 poppler_qt4 zlib ]; nativeBuildInputs = [ pkgconfig poppler qmake4Hook ]; - NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler"; + NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; preConfigure = '' qmakeFlags="$qmakeFlags DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps" |