diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/libsearpc | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/libsearpc')
| -rw-r--r-- | pkgs/development/libraries/libsearpc/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/libraries/libsearpc/libsearpc.pc.patch | 10 |
2 files changed, 7 insertions, 22 deletions
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index c9c105d1b18..199ae0b685c 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3Packages +, glib, jansson }: stdenv.mkDerivation rec { version = "3.2.0"; @@ -11,21 +12,15 @@ stdenv.mkDerivation rec { sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; }; - patches = [ ./libsearpc.pc.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf libtool python2Packages.python python2Packages.simplejson ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = with python3Packages; [ python simplejson ]; propagatedBuildInputs = [ glib jansson ]; - postPatch = "patchShebangs autogen.sh"; - - preConfigure = "./autogen.sh"; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System"; + description = "A simple and easy-to-use C language RPC framework based on GObject System"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ greizgh ]; }; } diff --git a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/pkgs/development/libraries/libsearpc/libsearpc.pc.patch deleted file mode 100644 index 6f30932ba6d..00000000000 --- a/pkgs/development/libraries/libsearpc/libsearpc.pc.patch +++ /dev/null @@ -1,10 +0,0 @@ -From: Aaron Lindsay <aaron@aclindsay.com> - ---- a/libsearpc.pc.in 2013-01-10 01:35:24.000000000 -0500 -+++ b/libsearpc.pc.in 2013-01-19 11:31:50.479301798 -0500 -@@ -1,4 +1,4 @@ --prefix=(DESTDIR)@prefix@ -+prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ |