alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
pipelight: Add support for 32 bit linux via #9000
This commit is contained in:
goibhniu 2015-11-24 23:15:40 +01:00
parent f3e2b0f5b6 03188ce0ef
commit e2fbd2d3dd
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/misc/pipelight/default.nix
View file

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

1
pkgs/top-level/all-packages.nix
View file

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