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

indilib: 1.1.0 -> 1.8.6

Browse Source
This commit is contained in:
Hunter Jones 2020-11-01 13:14:33 -06:00 committed by Alyssa Ross
parent 4365578bdf
commit 58f024530a
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -3493,6 +3493,12 @@
email = "t@larkery.com";
name = "Tom Hinton";
};
hjones2199 = {
email = "hjones2199@gmail.com";
github = "hjones2199";
githubId = 5525217;
name = "Hunter Jones";
};
hkjn = {
email = "me@hkjn.me";
name = "Henrik Jonsson";

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

@ -1,5 +1,5 @@
{ stdenv
, fetchurl
, fetchFromGitHub
, cmake
, cfitsio
, libusb1
@ -9,14 +9,18 @@
, curl
, libjpeg
, gsl
, fftw
}:
stdenv.mkDerivation {
name = "indilib-1.1.0";
stdenv.mkDerivation rec {
pname = "indilib";
version = "1.8.6";
src = fetchurl {
url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz";
sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
sha256 = "1yzvcm7lwhwssnvv6gp8f7igmnvs35bpidmzz6z15awm5841yw30";
};
patches = [
@ -36,12 +40,14 @@ stdenv.mkDerivation {
libnova
libjpeg
gsl
fftw
];
meta = {
meta = with stdenv.lib; {
homepage = "https://www.indilib.org/";
license = stdenv.lib.licenses.lgpl2Plus;
description = "Implementaion of the INDI protocol for POSIX operating systems";
platforms = stdenv.lib.platforms.unix;
description = "Implementation of the INDI protocol for POSIX operating systems";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = [ "x86_64-linux" ];
};
}

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

@ -1,12 +1,11 @@
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")
################## Includes ################################
Include (CheckCXXSourceCompiles)
--- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500
+++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600
@@ -77,7 +77,7 @@
## the following are directories where stuff will be installed to
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/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")
set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})