Merge branch 'master' into staging-next

https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
parent 0e4e47512d 2be707eca8
commit f19eb635b4
457 changed files with 8204 additions and 3941 deletions
@@ -114,6 +114,7 @@ mkDerivation rec {
    "-DENABLE_INTERNALMYSQL=1"
    "-DENABLE_MEDIAPLAYER=1"
    "-DENABLE_QWEBENGINE=on"
+    "-DENABLE_APPSTYLES=on"
  ];

  dontWrapGApps = true;