diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/libcbor | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libcbor')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libcbor/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix index 9b6a54d92f97..ae5154eac034 100644 --- a/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -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"; |