diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-11-07 11:02:37 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-11-07 11:02:46 +0300 |
| commit | ab21519858dabc9a1b841ccdd4bc80a40250098a (patch) | |
| tree | 7cec9f206192112a2037cf8d2c6d6721397dcb68 /pkgs/tools/X11/bumblebee | |
| parent | 1e8384a20bc324f6698f15e1858bdc48952599f4 (diff) | |
bumblebee: use fetchpatch for GitHub patches
Diffstat (limited to 'pkgs/tools/X11/bumblebee')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 116a7a014eab..0429faab2ef8 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib @@ -49,13 +49,13 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); - modprobePatch = fetchurl { + modprobePatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; - sha256 = "0x9qvhw6sn606dqcp3394irj6jjhw3h75k3lpbys6gha1yshgjps"; + sha256 = "02vq3vba6nx7gglpjdfchws9vjhs1x02a543yvqrxqpvvdfim2x2"; }; - libkmodPatch = fetchurl { + libkmodPatch = fetchpatch { url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; - sha256 = "0j2v0lncjfn2nw3324q3n69lw3yz3hah6bscc8xn9a2df2dcawj1"; + sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; }; in stdenv.mkDerivation rec { @@ -104,9 +104,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ] - ++ [ kmod automake111x autoconf ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; + buildInputs = [ libX11 glib libbsd kmod ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. |