diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/zeromq | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/zeromq')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/zeromq/4.x.nix | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index b37dfbdd7077..53b1f2f7431a 100644 --- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium -, enableDrafts ? false }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, asciidoc +, pkg-config +, libsodium +, enableDrafts ? false +}: stdenv.mkDerivation rec { pname = "zeromq"; @@ -12,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; }; + patches = [ + # Backport gcc-13 fix: + # https://github.com/zeromq/libzmq/pull/4480 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; + hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; + }) + ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; |