Merge pull request #11060 from cillianderoiste/jraygauthier-jrg/pipelight_32_bit_support

pipelight: Add support for 32 bit linux via #9000

pkgs/tools/misc/pipelight/default.nix

@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg
-  , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
-  }:
+{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, mesa, perl, wineStaging
+ }:
 
 let
   wine_custom = wineStaging;
@@ -19,13 +18,14 @@ in stdenv.mkDerivation rec {
     sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
   };
 
-  buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ];
+  buildInputs = [ wine_custom libX11 mesa curl ];
+
   propagatedbuildInputs = [ curl cabextract ];
 
   patches = [ ./pipelight.patch ];
 
   configurePhase = ''
-    patchShebangs . 
+    patchShebangs .
     ./configure \
       --prefix=$out \
       --moz-plugin-path=$out/${mozillaPluginPath} \
@@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
     homepage = "http://pipelight.net/";
     license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
     description = "A wrapper for using Windows plugins in Linux browsers";
-    maintainers = with stdenv.lib.maintainers; [skeidel];
+    maintainers = with stdenv.lib.maintainers; [ skeidel ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -8011,6 +8011,7 @@ let
   physfs = callPackage ../development/libraries/physfs { };
 
   pipelight = callPackage ../tools/misc/pipelight {
+    stdenv = stdenv_32bit;
     wineStaging = pkgsi686Linux.wineStaging;
   };