diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
| commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
| tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/misc | |
| parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
| parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
| download | nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip | |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/uboot/nanonote.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index e73e6ff05fe5..514655bd727f 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? false, qt4 +, pkgconfig, polkit, qtSupport ? true, qt4 }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index ef0bc190980a..c45eb3f1d24f 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { done chmod +w -R * sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h + # Load more than 2MiB for the kernel + sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h ''; # Remove the cross compiler prefix, and add reiserfs support |