treewide: structured-attrs fixes
This commit is contained in:
parent
6ca6ac796b
commit
f6a3f5af36
|
@ -22,8 +22,5 @@ mkDerivation {
|
|||
outputs = [ "out" "dev" ];
|
||||
# Fix build with cups deprecations etc.
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/73334
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=format-security"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -173,7 +173,7 @@ stdenv.mkDerivation (rec {
|
|||
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
|
||||
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
|
||||
"--disable-large-address-space"
|
||||
] ++ stdenv.lib.optional enableDwarf [
|
||||
] ++ stdenv.lib.optionals enableDwarf [
|
||||
"--enable-dwarf-unwind"
|
||||
"--with-libdw-includes=${stdenv.lib.getDev elfutils}/include"
|
||||
"--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib"
|
||||
|
|
Loading…
Reference in a new issue