JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: structured-attrs fixes

Browse Source
This commit is contained in:
Robin Gloster 2019-11-24 17:14:28 +01:00 committed by Jan Tojnar
parent 6ca6ac796b
commit f6a3f5af36
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/kde/print-manager.nix
View File

@ -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";
}

2
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View File

@ -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 = ''

2
pkgs/development/compilers/ghc/head.nix
View File

@ -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"