Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'

1 files changed, 6 insertions, 114 deletions

diff --git a/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
index af42b579a423..75ce3344e203 100644
--- a/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,120 +1,12 @@
 { stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive
-, extraPkgs ? pkgs: [] }:
+, extraPkgs ? pkgs: [], appimageTools }:
 
-buildFHSUserEnv {
+let
+  fhsArgs = appimageTools.defaultFhsEnvArgs;
+in buildFHSUserEnv (fhsArgs // {
   name = "appimage-run";
 
-  # Most of the packages were taken from the Steam chroot
-  targetPkgs = pkgs: with pkgs; [
-    gtk3
-    bashInteractive
-    gnome3.zenity
-    python2
-    xorg.xrandr
-    which
-    perl
-    xdg_utils
-    iana-etc
-  ] ++ extraPkgs pkgs;
-
-  multiPkgs = pkgs: with pkgs; [
-    desktop-file-utils
-    xorg.libXcomposite
-    xorg.libXtst
-    xorg.libXrandr
-    xorg.libXext
-    xorg.libX11
-    xorg.libXfixes
-    libGL
-
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-ugly
-    libdrm
-    xorg.xkeyboardconfig
-    xorg.libpciaccess
-
-    glib
-    gtk2
-    bzip2
-    zlib
-    gdk_pixbuf
-
-    xorg.libXinerama
-    xorg.libXdamage
-    xorg.libXcursor
-    xorg.libXrender
-    xorg.libXScrnSaver
-    xorg.libXxf86vm
-    xorg.libXi
-    xorg.libSM
-    xorg.libICE
-    gnome2.GConf
-    freetype
-    (curl.override { gnutlsSupport = true; sslSupport = false; })
-    nspr
-    nss
-    fontconfig
-    cairo
-    pango
-    expat
-    dbus
-    cups
-    libcap
-    SDL2
-    libusb1
-    udev
-    dbus-glib
-    libav
-    atk
-    at-spi2-atk
-    libudev0-shim
-    networkmanager098
-
-    xorg.libXt
-    xorg.libXmu
-    xorg.libxcb
-    libGLU
-    libuuid
-    libogg
-    libvorbis
-    SDL
-    SDL2_image
-    glew110
-    openssl
-    libidn
-    tbb
-    wayland
-    mesa_noglu
-    libxkbcommon
-
-    flac
-    freeglut
-    libjpeg
-    libpng12
-    libsamplerate
-    libmikmod
-    libtheora
-    libtiff
-    pixman
-    speex
-    SDL_image
-    SDL_ttf
-    SDL_mixer
-    SDL2_ttf
-    SDL2_mixer
-    gstreamer
-    gst-plugins-base
-    libappindicator-gtk2
-    libcaca
-    libcanberra
-    libgcrypt
-    libvpx
-    librsvg
-    xorg.libXft
-    libvdpau
-    alsaLib
-    strace
-  ];
+  targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
 
   runScript = writeScript "appimage-exec" ''
     #!${stdenv.shell}
@@ -153,4 +45,4 @@ buildFHSUserEnv {
 
     exec ./AppRun
   '';
-}
+})