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

treewide: NIX_*_FLAGS -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 03:23:29 +01:00
committed by Jan Tojnar
parent 5f2b92e3ec
commit f9f46dc327
47 changed files with 63 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/openjdk/default.nix
View File

@@ -69,13 +69,13 @@ let
separateDebugInfo = true;
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
NIX_CFLAGS_COMPILE = "-Wno-error";
NIX_LDFLAGS = lib.optionals (!headless) [
NIX_LDFLAGS = toString (lib.optionals (!headless) [
"-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
] ++ lib.optionals (!headless && enableGnome2) [
"-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
];
]);
buildFlags = [ "all" ];

2
pkgs/development/compilers/openjdk/openjfx/12.nix
View File

@@ -84,7 +84,7 @@ in makePackage {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
stripDebugList = [ "." ];