From 81b4eef864edabd9ea3f470ced3d090703dd7e5e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 16 Jan 2012 17:36:59 +0000
Subject: [PATCH] jasper: propagate libjpeg, kopete: remove 'fix'

svn path=/nixpkgs/trunk/; revision=31595
---
 .../kde-4.8/kdenetwork/FindJasper.cmake       | 35 -------------------
 pkgs/desktops/kde-4.8/kdenetwork/kopete.nix   |  1 -
 pkgs/development/libraries/jasper/default.nix |  3 +-
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake

diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
deleted file mode 100644
index bb06a7bd8d3..00000000000
--- a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
+++ /dev/null
@@ -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)
diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
index 27b36ba6d1b..ec48b96fe19 100644
--- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
@@ -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" ];
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index bca8aedfd4b..8cf4cc7991f 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
   };
 
-  buildInputs = [unzip libjpeg];
+  buildNativeInputs = [unzip];
+  propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";