mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
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).
This commit is contained in:
parent
e2d44f6737
commit
52cf8fea4f
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user