public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake, podofo: fix finding freetype-2.5

Browse Source
This commit is contained in:
Vladimír Čunát 2014-06-26 18:24:44 +02:00
parent e993219be7
commit 02a1e85ab1
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/podofo/default.nix
View File

@ -1,12 +1,14 @@
{stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig, { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
openssl, libpng, lua5}: , openssl, libpng, lua5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "podofo-0.9.2"; name = "podofo-0.9.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/podofo/${name}.tar.gz"; url = "mirror://sourceforge/podofo/${name}.tar.gz";
sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6"; sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
}; };
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ lua5 stdenv.gcc.libc ]; buildInputs = [ lua5 stdenv.gcc.libc ];
@ -17,6 +19,15 @@ stdenv.mkDerivation rec {
lua5.crossDrv stdenv.gccCross.libc ]; lua5.crossDrv stdenv.gccCross.libc ];
}; };
# fix finding freetype-2.5
preConfigure = ''
substituteInPlace ./CMakeLists.txt \
--replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \
--replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype'
rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake
'';
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
meta = { meta = {

7
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4 , useNcurses ? false, ncurses, useQt4 ? false, qt4
}: }:
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = patches =
[(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
name = "FindFreetype-2.5.patch";
url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
})] ++
# Don't search in non-Nix locations such as /usr, but do search in # Don't search in non-Nix locations such as /usr, but do search in
# Nixpkgs' Glibc. # Nixpkgs' Glibc.
optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? glibc) ./search-path.patch ++