diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-10 20:28:32 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-12 22:23:20 +0100 |
commit | 0fdec325b6a8fa4d78a1981ba5fd60af95deb4c9 (patch) | |
tree | f94e61590441d3baf863aa8c4977d2067945b38e /pkgs/development/libraries/gamin | |
parent | dad776844ff2ca868e441112d3d3197a02f122d8 (diff) |
gamin: switch to pname+version, cleanup
Diffstat (limited to 'pkgs/development/libraries/gamin')
-rw-r--r-- | pkgs/development/libraries/gamin/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 56de42d9dc5b5..a2d6078024d58 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: -let - cross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation (rec { - name = "gamin-0.1.10"; +stdenv.mkDerivation rec { + pname = "gamin"; + version = "0.1.10"; src = fetchurl { - url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; + url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz"; sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; @@ -22,6 +21,10 @@ in stdenv.mkDerivation (rec { "CPPFLAGS=-D_GNU_SOURCE" ]; + preBuild = lib.optionalString stdenv.isDarwin '' + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile + ''; + patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) ++ lib.optional stdenv.cc.isClang ./returnval.patch @@ -29,7 +32,7 @@ in stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ; + }) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch; meta = with lib; { @@ -41,8 +44,3 @@ in stdenv.mkDerivation (rec { }; } -// lib.optionalAttrs stdenv.isDarwin { - preBuild = '' - sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile - ''; -}) |