From 58f024530a5482759295c282acb99da8efc1ee11 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Sun, 1 Nov 2020 13:14:33 -0600 Subject: [PATCH] indilib: 1.1.0 -> 1.8.6 --- maintainers/maintainer-list.nix | 6 +++++ .../development/libraries/indilib/default.nix | 26 ++++++++++++------- .../libraries/indilib/udev-dir.patch | 23 ++++++++-------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4bee75ed035..48f847b3d19 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index fadd2657b68..212b2f743d3 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -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" ]; }; } diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch index 0f497419e70..70168001291 100644 --- a/pkgs/development/libraries/indilib/udev-dir.patch +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -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}) +