about summary refs log tree commit diff
path: root/pkgs/tools/misc/pipelight/default.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2015-05-10 13:32:35 +0300
committerMichael Raskin <7c6f434c@mail.ru>2015-05-10 13:36:48 +0300
commitbbcc0c0f07d931713091bed74ca5c496f8e20acd (patch)
tree5c0ca5f09ad9644eeb224e68912631502d13f0b4 /pkgs/tools/misc/pipelight/default.nix
parent90453cc5ca4f09447f570bb3f8cf7b48bdd39546 (diff)
downloadnixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar.gz
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar.bz2
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar.lz
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar.xz
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.tar.zst
nixlib-bbcc0c0f07d931713091bed74ca5c496f8e20acd.zip
Update Pipelight to use wine-staging
Diffstat (limited to 'pkgs/tools/misc/pipelight/default.nix')
-rw-r--r--pkgs/tools/misc/pipelight/default.nix39
1 files changed, 2 insertions, 37 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index aa0be62ed64c..cb130c8e9178 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";