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

Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13

Browse Source 
Conflicts:
	pkgs/development/compilers/adoptopenjdk-bin/sources.json
          -- keep newer adoptopenjdk versions from HEAD^2
This commit is contained in:
Matt McHenry
2020-03-09 12:29:43 -04:00
parent d00559ebb8 82b54d4906
commit 1b8719437b
9523 changed files with 292866 additions and 210816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/openjdk/openjfx/11.nix
+1 -1
View File
@@ -87,7 +87,7 @@ in makePackage {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
stripDebugList = [ "." ];
pkgs/development/compilers/openjdk/openjfx/13.nix
+1 -1
View File
@@ -90,7 +90,7 @@ in makePackage {
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
stripDebugList = [ "." ];