Author: urkud
Date: Sat Jan 14 18:04:18 2012
New Revision: 31562
URL: https://nixos.org/websvn/nix/?rev=31562&sc=1
Log:
kopete: depend on sqlite, fix FindJasper
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake Sat Jan
14 18:04:18 2012 (r31562)
@@ -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 <neund...@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)
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix Sat Jan 14
18:04:14 2012 (r31561)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix Sat Jan 14
18:04:18 2012 (r31562)
@@ -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" ];
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
