diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:38:02 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:41:51 +0100 |
commit | c778945806b44d46ec16bc4302e7e7163e6bab97 (patch) | |
tree | 8c9c088a40cc1619fe6a27e32d295df45c9e9ebc /pkgs/development/libraries/gamin | |
parent | 38f85a5bba7038f31a352b09ff7bc68fcbad2633 (diff) |
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
Diffstat (limited to 'pkgs/development/libraries/gamin')
-rw-r--r-- | pkgs/development/libraries/gamin/abstract-socket-namespace.patch | 73 | ||||
-rw-r--r-- | pkgs/development/libraries/gamin/default.nix | 10 |
2 files changed, 4 insertions, 79 deletions
diff --git a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/pkgs/development/libraries/gamin/abstract-socket-namespace.patch deleted file mode 100644 index ff1610559721e..0000000000000 --- a/pkgs/development/libraries/gamin/abstract-socket-namespace.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 -From: Christian Kampka <christian@kampka.net> -Date: Tue, 1 Sep 2020 13:54:35 +0200 -Subject: [PATCH] Pin abstract namespace sockets to host_os - -Running programs with AC_RUN_IFELSE fails when cross-compiling. -Since abstract namespace sockets are linux feature, we can easily -assume it is available for linux and not for darwin. ---- - configure.in | 47 ++++++----------------------------------------- - 1 file changed, 6 insertions(+), 41 deletions(-) - -diff --git a/configure.in b/configure.in -index eb129db..0ed82ba 100644 ---- a/configure.in -+++ b/configure.in -@@ -387,47 +387,12 @@ fi - - #### Abstract sockets - --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include <sys/types.h> --#include <stdlib.h> --#include <string.h> --#include <stdio.h> --#include <sys/socket.h> --#include <sys/un.h> --#include <errno.h> --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) -+AC_MSG_CHECKING([whether target os has abstract socket namespace]) -+if test x$target_os = xlinux-gnu ; then -+ have_abstract_sockets=yes -+else -+ have_abstract_sockets=no -+fi - AC_MSG_RESULT($have_abstract_sockets) - - if test x$enable_abstract_sockets = xyes; then --- -2.25.4 - diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 89096c8874508..38451571d8b67 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: -let - cross = stdenv.hostPlatform != stdenv.buildPlatform; -in stdenv.mkDerivation (rec { +stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -10,7 +8,7 @@ in stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib ]; @@ -29,7 +27,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"; - }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; + }); meta = with stdenv.lib; { |