diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2015-05-10 13:32:35 +0300 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-05-10 13:46:32 +0200 |
commit | de02c8e8807d797e1b71ba8fb327eb30ede23318 (patch) | |
tree | 4fe7d4808d5e8b47d71bee043eae4439ac2ca1e2 /pkgs/tools | |
parent | a31b9e1816daeb7d420b75ef7356edb215fc54b9 (diff) | |
download | nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar.gz nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar.bz2 nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar.lz nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar.xz nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.tar.zst nixpkgs-de02c8e8807d797e1b71ba8fb327eb30ede23318.zip |
Update Pipelight to use wine-staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index aa0be62ed64..cb130c8e917 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,44 +1,9 @@ -{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr }: let - wine_patches_version = "1.7.38"; - wine_hash = "1h3bsga9qzqkavf9wlv62ldl3a8mz7grr68nxv8vicmnglzfj7lq"; - - wine_patches = fetchgit { - url = "git://github.com/compholio/wine-compholio.git"; - rev = "refs/tags/v${wine_patches_version}"; - sha256 = "0lcagswy1lgqz6qlpf0ng7ksl2sbaqldrgnhf0n1278jj82rq80n"; - }; - - wine_custom = - stdenv.lib.overrideDerivation wineUnstable (args: rec { - name = "wine-${wine_patches_version}"; - version = "${wine_patches_version}"; - src = null; - srcs = [ - (fetchurl { - url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = wine_hash; - }) - wine_patches ]; - sourceRoot = "./${name}"; - buildInputs = args.buildInputs ++ [ - autoconf perl utillinux automake attr - ]; - nativeBuildInputs = args.nativeBuildInputs ++ [ - autoconf perl utillinux automake attr - ]; - postPatch = '' - export wineDir=$(pwd) - patchShebangs $wineDir/tools/ - chmod u+w $wineDir/../${wine_patches.name}/debian/tools/ - patchShebangs $wineDir/../${wine_patches.name}/debian/tools/ - chmod -R +rwx ../${wine_patches.name}/ - make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install - ''; - }); + wine_custom = wineStaging; mozillaPluginPath = "/lib/mozilla/plugins"; |