Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"

I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
This commit is contained in:
Vladimír Čunát
2020-10-25 09:41:51 +01:00
parent 38f85a5bba
commit c778945806
93 changed files with 2696 additions and 783 deletions
+3 -10
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "brotli";
version = "1.0.9";
version = "1.0.7";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c=";
sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
};
nativeBuildInputs = [ cmake ];
@@ -32,14 +32,7 @@ stdenv.mkDerivation rec {
# This breaks on Darwin because our cmake hook tries to make a build folder
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
prePatch = ''
rm BUILD
# Upstream fixed this reference to runtime-path after the release
# and with this references g++ complains about invalid option -R
sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in
cat scripts/libbrotli*.pc.in
'';
prePatch = "rm BUILD";
# Don't bother with "man" output for now,
# it currently only makes the manpages hard to use.