diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-10-04 13:12:45 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-10-04 13:12:45 +0000 |
| commit | 85fc2de83e0c4a5e2e50b595da96287994d764a0 (patch) | |
| tree | d8fbac647f853c83087e122ab2b59459b6282cba /pkgs/misc | |
| parent | 695de4ed648f4c302c0efd086e61fcd207fa5060 (diff) | |
| parent | 4bd5a070d4489a3f5d58b035717e12001c962742 (diff) | |
| download | nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar.gz nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar.bz2 nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar.lz nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar.xz nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.tar.zst nixlib-85fc2de83e0c4a5e2e50b595da96287994d764a0.zip | |
svn merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=29627
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/src-for-default.nix | 9 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/src-info-for-default.nix | 6 |
3 files changed, 6 insertions, 25 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 51711c7c5283..17755a17b7ba 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -6,21 +6,17 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -let - s = import ./src-for-default.nix; -in - stdenv.mkDerivation rec { - name = "wine-${s.version}"; + name = "wine-1.3.29"; src = fetchurl { - url = s.url; - sha256 = s.hash; + url = "mirror://sourceforge/wine/${name}.tar.bz2"; + sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1"; }; gecko = fetchurl { - url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab"; - sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp"; + url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi"; + sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab"; }; buildInputs = [ @@ -45,7 +41,7 @@ stdenv.mkDerivation rec { # elements specified above. dontPatchELF = true; - postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab"; + postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}"; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix deleted file mode 100644 index b6669843896a..000000000000 --- a/pkgs/misc/emulators/wine/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.3.27"; - name="wine-1.3.27"; - hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1"; - url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2"; - - -} diff --git a/pkgs/misc/emulators/wine/src-info-for-default.nix b/pkgs/misc/emulators/wine/src-info-for-default.nix deleted file mode 100644 index 5f25399a0de1..000000000000 --- a/pkgs/misc/emulators/wine/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://www.winehq.org/"; - baseName = "wine"; - versionExtractorSedScript = ''s/[^-]*-(.+)[.]tar[.].*/\1/''; - versionReferenceCreator = ''$(replaceAllVersionOccurences)''; -} |