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

indilib version advance; older sources no longer available

Browse Source
This commit is contained in:
Karn Kallio
2015-03-29 14:26:07 -04:30
committed by Thomas Tuegel
parent d8eddfa2c4
commit b09a6573a0
7 changed files with 19 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/indilib/0_9_9.nix
View File

@@ -1,21 +0,0 @@
{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }:
stdenv.mkDerivation {
name = "indilib-0.9.9";
src = fetchurl {
url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz;
sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039";
};
propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ];
nativeBuildInputs = [ cmake pkgconfig ];
preConfigure = ''
cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d"
'';
meta = {
homepage = http://indi.sf.net;
};
}

14
pkgs/development/libraries/indilib/default.nix
View File

@@ -1,16 +1,18 @@
{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }:
{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova
, libjpeg, gsl }:
stdenv.mkDerivation {
name = "indilib-0.9.6";
name = "indilib-1.0.0";
src = fetchurl {
url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz;
sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4";
url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz;
sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm";
};
patches = [ ./link-zlib.patch ./udev-dir.patch ];
patches = [ ./udev-dir.patch ] ;
propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ];
propagatedBuildInputs = [ cmake cfitsio libusb zlib boost
libnova libjpeg gsl ];
meta = {
homepage = http://indi.sf.net;

12
pkgs/development/libraries/indilib/link-zlib.patch
View File

@@ -1,12 +0,0 @@
diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt
--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430
+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430
@@ -169,7 +169,7 @@
# To link with main() and indibase classes ######
##################################################
add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS})
-target_link_libraries(indidriver ${LIBUSB_LIBRARIES})
+target_link_libraries(indidriver z ${LIBUSB_LIBRARIES})
if (NOVA_FOUND)
target_link_libraries(indidriver ${NOVA_LIBRARIES})
endif(NOVA_FOUND)

22
pkgs/development/libraries/indilib/udev-dir.patch
View File

@@ -1,12 +1,12 @@
diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt
--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430
+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430
@@ -13,7 +13,7 @@
set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/")
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
-set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d")
+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d")
diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt
--- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430
+++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430
@@ -28,7 +28,7 @@
## the following are directories where stuff will be installed to
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/")
-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
IF(APPLE)
set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup")
################## Includes ################################
Include (CheckCXXSourceCompiles)