swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Pipelight: both Wine version and Pipelight distribution

Browse source
This commit is contained in:
Michael Raskin 2014-11-02 23:36:36 +03:00
parent 815bbfb852
commit 4ef5bd9918
2 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,13 @@
}:
let
wine_patches_version = "1.7.28";
wine_hash = "04r3zk3dz2vzly2a4nqbcvppjs5iy3lq5ibx3wfrf877p5bz3hv7";
wine_patches_version = "1.7.30";
wine_hash = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh";
wine_patches = fetchgit {
url = "git://github.com/compholio/wine-compholio.git";
rev = "refs/tags/v${wine_patches_version}";
sha256 = "17f1wmxbx6ly1ws4p528ijf9b4yvmnmap5k7npw9icvkyaky5xi9";
sha256 = "02i0bpxxiyxavlcd5qm7wv0q4bm9bxr3ng3w2k234ww7cyndm0ws";
};
wine_custom =
@ -45,13 +45,13 @@ let
in stdenv.mkDerivation rec {
version = "0.2.7.2";
version = "0.2.7.3";
name = "pipelight-${version}";
src = fetchurl {
url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz";
sha256 = "02132151091f1f62d7409a537649efc86deb0eb4a323fd66907fc22947e2cfbd";
sha256 = "0lifgs3aakyxfk6r2f2p27z0iqzgz1dinqfgwx3vdh3l93s8aifv";
};
buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ];

27
pkgs/tools/misc/pipelight/pipelight.patch
View file

@ -66,33 +66,6 @@ diff -urN pipelight.old/configure pipelight.new/configure
moz_plugin_path=""
gcc_runtime_dlls=""
so_mode="0644"
diff -urN pipelight.old/Makefile pipelight.new/Makefile
--- pipelight.old/Makefile 2014-07-19 22:53:02.000000000 +0200
+++ pipelight.new/Makefile 2014-07-26 23:25:22.020707765 +0200
@@ -29,7 +29,7 @@
-e 's|@@BINDIR@@|$(bindir)|g' \
-e 's|@@DATADIR@@|$(datadir)|g' \
-e 's|@@GCC_RUNTIME_DLLS@@|$(gcc_runtime_dlls)|g' \
- -e 's|@@GPG@@|$(gpgexec)|g' \
+ -e 's|@@GPG@@|$(gpg_exec)|g' \
-e 's|@@LIBDIR@@|$(libdir)|g' \
-e 's|@@MANDIR@@|$(mandir)|g' \
-e 's|@@MOZ_PLUGIN_PATH@@|$(moz_plugin_path)|g' \
@@ -69,12 +69,12 @@
.PHONY: prebuilt32
prebuilt32: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig
- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
+ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader.exe src/winecheck/winecheck.exe
.PHONY: prebuilt64
prebuilt64: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig
- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
+ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig"
tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader64.exe src/winecheck/winecheck64.exe
.PHONY: pluginloader32
diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dependency
--- pipelight.old/share/install-dependency 2014-07-19 22:53:02.000000000 +0200
+++ pipelight.new/share/install-dependency 2014-07-26 23:26:18.431938546 +0200