From 52cf8fea4fefeb990d72d2159ce42cf7cf94dd2f Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Tue, 26 Jul 2022 01:06:38 -0700
Subject: [PATCH] libpipeline: 1.5.4 -> 1.5.6

This commit bumps libpipeline and drops the gnulib patch since the
vendored copy of gnulib has been updated.  I avoided squashing this
commit into the previous one since knowing how to patch libpipeline
1.5.4 without upgrading might be useful (for example, in a git bisect
or cherry-pick).
---
 .../libraries/libpipeline/default.nix          | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index 7cab0816147..3630980353a 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,7 +1,4 @@
-{ lib, stdenv, fetchurl
-, gnulib
-, runCommand
-, patchutils }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "libpipeline";
@@ -12,18 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-uLRRlJiQIqeewTF/ZKKnWxVRsqVb6gb2dwTLKi5GkLA=";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
-    ./fix-on-osx.patch
-  ] ++ [
-    (runCommand "longdouble-redirect-patch-extraPrefix" {} ''
-      ${patchutils}/bin/filterdiff \
-        --strip=1 \
-        --addoldprefix=a/gl/ \
-        --addnewprefix=b/gl/ \
-        ${gnulib.passthru.longdouble-redirect-patch} \
-        > $out
-    '')
-  ];
+  patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
 
   meta = with lib; {
     homepage = "http://libpipeline.nongnu.org";