diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
| commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
| tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/libsearpc | |
| parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
| parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
| download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip | |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsearpc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libsearpc/default.nix | 17 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch | 10 |
2 files changed, 6 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix index 1ac5cef7c5f6..199ae0b685cf 100644 --- a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, 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 = [ pkg-config ]; - 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 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/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch b/nixpkgs/pkgs/development/libraries/libsearpc/libsearpc.pc.patch deleted file mode 100644 index 6f30932ba6db..000000000000 --- a/nixpkgs/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@ |