diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/gamin | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gamin')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gamin/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gamin/default.nix b/nixpkgs/pkgs/development/libraries/gamin/default.nix index 56de42d9dc5b..a2d6078024d5 100644 --- a/nixpkgs/pkgs/development/libraries/gamin/default.nix +++ b/nixpkgs/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 - ''; -}) |