diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/misc | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/wine-warcraft.nix | 13 | ||||
| -rw-r--r-- | pkgs/misc/sane-backends/default.nix | 9 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix index e4ba8c7d72d4..b45ea75c28f6 100644 --- a/pkgs/misc/emulators/wine/wine-warcraft.nix +++ b/pkgs/misc/emulators/wine/wine-warcraft.nix @@ -6,12 +6,9 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -let - s = import ./src-for-default.nix; -in - stdenv.mkDerivation rec { - name = "wine-warcraft-${s.version}"; + name = "wine-warcraft-${version}"; + version = "1.1.19"; src = fetchgit { url = git://repo.or.cz/wine/warcraft3.git; @@ -40,11 +37,11 @@ stdenv.mkDerivation rec { # elements specified above. dontPatchELF = true; - meta = { + meta = with stdenv.lib; { homepage = "http://www.winehq.org/"; license = "LGPL"; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3"; + maintainers = [ maintainers.phreedom ]; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 63fb29a7eb35..65e748b68fcf 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, hotplugSupport ? false, libusb ? null , gt68xxFirmware ? null }: - +let + firmware = gt68xxFirmware {inherit fetchurl;}; +in assert hotplugSupport -> stdenv.system == "i686-linux"; stdenv.mkDerivation { @@ -24,8 +26,7 @@ stdenv.mkDerivation { preInstall = if gt68xxFirmware != null then - "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + - (gt68xxFirmware {inherit fetchurl;}) + - " \${out}/share/sane/gt68xx/PS1fw.usb " + "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + + " \${out}/share/sane/gt68xx/" + firmware.name else ""; } |