lol

gamin: switch to pname+version, cleanup

+9 -11
+9 -11
pkgs/development/libraries/gamin/default.nix
··· 1 { lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: 2 3 - let 4 - cross = stdenv.hostPlatform != stdenv.buildPlatform; 5 - in stdenv.mkDerivation (rec { 6 - name = "gamin-0.1.10"; 7 8 src = fetchurl { 9 - url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz"; 10 sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; 11 }; 12 ··· 22 "CPPFLAGS=-D_GNU_SOURCE" 23 ]; 24 25 patches = [ ./deadlock.patch ] 26 ++ map fetchurl (import ./debian-patches.nix) 27 ++ lib.optional stdenv.cc.isClang ./returnval.patch ··· 29 name = "fix-pthread-mutex.patch"; 30 url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; 31 sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; 32 - }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ; 33 34 35 meta = with lib; { ··· 41 }; 42 } 43 44 - // lib.optionalAttrs stdenv.isDarwin { 45 - preBuild = '' 46 - sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile 47 - ''; 48 - })
··· 1 { lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }: 2 3 + stdenv.mkDerivation rec { 4 + pname = "gamin"; 5 + version = "0.1.10"; 6 7 src = fetchurl { 8 + url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz"; 9 sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; 10 }; 11 ··· 21 "CPPFLAGS=-D_GNU_SOURCE" 22 ]; 23 24 + preBuild = lib.optionalString stdenv.isDarwin '' 25 + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile 26 + ''; 27 + 28 patches = [ ./deadlock.patch ] 29 ++ map fetchurl (import ./debian-patches.nix) 30 ++ lib.optional stdenv.cc.isClang ./returnval.patch ··· 32 name = "fix-pthread-mutex.patch"; 33 url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; 34 sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; 35 + }) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch; 36 37 38 meta = with lib; { ··· 44 }; 45 } 46