diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
| commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
| tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/tools/admin/tigervnc/default.nix | |
| parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
| parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
| download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/tools/admin/tigervnc/default.nix')
| -rw-r--r-- | pkgs/tools/admin/tigervnc/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 596c950b1f30..b2dedf4688d3 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -10,8 +10,8 @@ with stdenv.lib; stdenv.mkDerivation rec { - # Release version = "1.2.0"; - revision = 5005; + # Release version = "1.3.0"; + revision = 5129; version = "r${toString revision}"; name = "tigervnc-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz"; url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk"; rev = revision; - sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43"; + sha256 = "1qszlqr8z16iqkm05gbs0knj4fxc3bb6gjayky1abmf8pjazi0j8"; }; inherit fontDirectories; @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { tar xf ${xorgserver.src} cp -R xorg*/* unix/xserver pushd unix/xserver - for a in $xorgPatches + for a in $xorgPatches ../xserver114.patch do patch -p1 < $a done autoreconf -vfi - ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; |