summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorgoibhniu <cillian.deroiste@gmail.com>2015-11-24 23:15:40 +0100
committergoibhniu <cillian.deroiste@gmail.com>2015-11-24 23:15:40 +0100
commite2fbd2d3ddaa40981c8e6b549a613c37b6b0e077 (patch)
treea1ec50ddc0d4af9f8e637e0bd1bc2387d7773ac6 /pkgs/tools/misc
parentf3e2b0f5b6365d8cf0f72e254f85345d3a85274a (diff)
parent03188ce0efed95a1f362909565c9ccfc5118d456 (diff)
downloadnixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar.gz
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar.bz2
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar.lz
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar.xz
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.tar.zst
nixlib-e2fbd2d3ddaa40981c8e6b549a613c37b6b0e077.zip
Merge pull request #11060 from cillianderoiste/jraygauthier-jrg/pipelight_32_bit_support
pipelight: Add support for 32 bit linux via #9000
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/pipelight/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 40f441e065df..b79f43cfbc35 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/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;
   };
 }