mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

jasper: propagate libjpeg, kopete: remove 'fix'

Browse source 
svn path=/nixpkgs/trunk/; revision=31595
This commit is contained in:
Yury G. Kudryashov 2012-01-16 17:36:59 +00:00
parent 67f921896e
commit 81b4eef864
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,35 +0,0 @@
# - 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)

1
pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
View file

@ -14,7 +14,6 @@ kde {
patchPhase =
''
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
'';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

3
pkgs/development/libraries/jasper/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
};
buildInputs = [unzip libjpeg];
buildNativeInputs = [unzip];
propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared";