diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-11-25 21:31:09 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-11-25 21:37:30 +0100 |
commit | a41292792498e03024d682d092947c2153290073 (patch) | |
tree | b937402b60ea79cfa0e5562dad3268127a491d81 /pkgs/tools/misc/pipelight | |
parent | 8a664fd5bc6b170bdf809030de6871fd6a454f5a (diff) | |
parent | b34a6c96ee14518b82648c5a8c1b29225c15d9df (diff) |
Merge remote-tracking branch 'origin/master' into closure-size
Diffstat (limited to 'pkgs/tools/misc/pipelight')
-rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 070d30cb2496a..77fcb186ef1de 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; }; } |