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

kopete: depend on sqlite, fix FindJasper

Browse Source 
svn path=/nixpkgs/trunk/; revision=31562
This commit is contained in:
Yury G. Kudryashov 2012-01-14 18:04:18 +00:00
parent abcc1e56db
commit cd62169a20
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake Normal file
View File

@ -0,0 +1,35 @@
# - Try to find the Jasper JPEG2000 library
# Once done this will define
#
# JASPER_FOUND - system has Jasper
# JASPER_INCLUDE_DIR - the Jasper include directory
# JASPER_LIBRARIES - The libraries needed to use Jasper
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PACKAGE(JPEG)
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
SET(JASPER_LIBRARIES ${JASPER_LIBRARY})
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR)
MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)

10
pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
View File

@ -1,17 +1,21 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
libgadu, boost, qca2, gpgme }:
libgadu, boost, qca2, gpgme, sqlite }:
kde {
buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
gpgme ];
gpgme sqlite ];
buildNativeInputs = [ pkgconfig ];
KDEDIRS = libktorrent;
patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake";
patchPhase =
''
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
'';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];