Merge staging-next into staging

2021-02-01 18:31:04 +00:00
parent f602c10ea7 eca8c09a50
commit 7044cd0c9d
113 changed files with 881 additions and 415 deletions
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3
-, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils
+, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils
 , epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
 }:

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    libarchive
    libao
    unzip
-    xdg_utils
+    xdg-utils
    gnome3.adwaita-icon-theme
  ];