Merge pull request #122836 from rmcgibbo/libunique
libunique: fix darwin
This commit is contained in:
commit
4db7d30365
@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
|
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Don't make deprecated usages hard errors
|
||||||
|
prePatch = ''
|
||||||
|
substituteInPlace configure --replace "-Werror" "";
|
||||||
|
'';
|
||||||
|
|
||||||
# glib-2.62 deprecations
|
# glib-2.62 deprecations
|
||||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||||
|
|
||||||
@ -23,9 +28,6 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ glib gtk2 dbus-glib ];
|
buildInputs = [ glib gtk2 dbus-glib ];
|
||||||
|
|
||||||
# Don't make deprecated usages hard errors
|
|
||||||
preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""'';
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user