Merge pull request #315719 from NixOS/backport-315482-to-release-24.05

[Backport release-24.05] disnix: include stdlib.h to fix implicit function declaration
This commit is contained in:
Robert Scott 2024-05-29 23:09:30 +01:00 committed by GitHub
commit cdbd8394aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, libxml2, libxslt, getopt, dysnomia, libintl, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "disnix"; pname = "disnix";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "0mc0wy8fca60w0d56cljq2cw1xigbp2dklb43fxa5xph94j3i49a"; sha256 = "0mc0wy8fca60w0d56cljq2cw1xigbp2dklb43fxa5xph94j3i49a";
}; };
patches = [
# https://github.com/svanderburg/disnix/pull/21
# fix implicit function declaration
(fetchpatch {
name = "add-stdlib.h.patch";
url = "https://github.com/svanderburg/disnix/commit/aa969f1d152acb35fc70c6c8db249b61f5a9eb41.patch";
hash = "sha256-RZNVVdZ7Rx8n7qzbJOw8BHL8f07mvh8IKpfsWexuVLU=";
})
];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ]; buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ];