public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
This commit is contained in:
Vladimír Čunát
2020-10-26 08:17:14 +01:00
parent 309ce3f8a1
commit 336bc8283b
92 changed files with 771 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libcbor/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcbor";
version = "unstable-2019-07-25";
version = "0.8.0";
src = fetchFromGitHub {
owner = "PJK";
repo = pname;
rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6";
sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1";
rev = "v${version}";
sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7";
};
nativeBuildInputs = [ cmake ];
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
NIX_CFLAGS_COMPILE = "-fno-lto";
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ];
meta = with stdenv.lib; {
description = "CBOR protocol implementation for C and others";