tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
pipelight: remove unused inputs, use stdenv_32bit
Cillian de Róiste
10 years ago
03188ce0
bd33a414
+7
-6
2 changed files
expand all
collapse all
unified
split
pkgs
tools
misc
pipelight
default.nix
top-level
all-packages.nix
+6
-6
pkgs/tools/misc/pipelight/default.nix
···
1
1
-
{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg
2
2
-
, gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
3
3
-
}:
1
1
+
{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, mesa, perl, wineStaging
2
2
+
}:
4
3
5
4
let
6
5
wine_custom = wineStaging;
···
19
18
sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
20
19
};
21
20
22
22
-
buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ];
21
21
+
buildInputs = [ wine_custom libX11 mesa curl ];
22
22
+
23
23
propagatedbuildInputs = [ curl cabextract ];
24
24
25
25
patches = [ ./pipelight.patch ];
26
26
27
27
configurePhase = ''
28
28
-
patchShebangs .
28
28
+
patchShebangs .
29
29
./configure \
30
30
--prefix=$out \
31
31
--moz-plugin-path=$out/${mozillaPluginPath} \
···
56
56
homepage = "http://pipelight.net/";
57
57
license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
58
58
description = "A wrapper for using Windows plugins in Linux browsers";
59
59
-
maintainers = with stdenv.lib.maintainers; [skeidel];
59
59
+
maintainers = with stdenv.lib.maintainers; [ skeidel ];
60
60
platforms = with stdenv.lib.platforms; linux;
61
61
};
62
62
}
+1
pkgs/top-level/all-packages.nix
···
7970
7970
physfs = callPackage ../development/libraries/physfs { };
7971
7971
7972
7972
pipelight = callPackage ../tools/misc/pipelight {
7973
7973
+
stdenv = stdenv_32bit;
7973
7974
wineStaging = pkgsi686Linux.wineStaging;
7974
7975
};
7975
7976