diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:44 +0100 |
| commit | 68430cf3d7dae00f8eda1156de6b90243424e25a (patch) | |
| tree | 4b008270a344486a20c8603047821923bf71e223 /pkgs/servers/x11/xorg | |
| parent | 8e0d77632e02720a8adf8126f126990501299191 (diff) | |
| parent | b5356f7f275e6fb15c6fda0ce65de26de98a87d0 (diff) | |
| download | nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.gz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.bz2 nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.lz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.xz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.zst nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.zip | |
Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here): pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'pkgs/servers/x11/xorg')
| -rw-r--r-- | pkgs/servers/x11/xorg/unichrome/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index 720ccd10158..bc1ebf4eb43 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -4,7 +4,7 @@ xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, autoconf, libtool, libXext, utilmacros, pixman}: stdenv.mkDerivation { - name = "xf86-video-unichrome-git"; + name = "xf86-video-unichrome"; src = fetchgit { url = "git://people.freedesktop.org/~libv/xf86-video-unichrome"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = "free"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } |