Fixes regression introduced by 16406e63b3.
Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:
foo="$(grep xxx)"
The replacement would be something like this:
foo="$/nix/store/.../bin/grep xxx)"
Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:
xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
"^Exec(\[[^]=]*])?=" "$file" |
/nix/store/.../bin/cut -d= -f 2- |
first_word`"'
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Change xdg-utils fetchgit url to `http` alternative since it is
more proxy-friendly. The list of repository url alternatives
can be found at http://cgit.freedesktop.org/xdg/xdg-utils/
The patch is borrowed verbatim from Debian. It is under the same
license as the rest of the package, and is necessary for the app to
work.
There does not seem to be a canonical upstream homepage for this app
other than Debian itself.
Change-Id: I4f0bec32a95778fb12a48bfb280386b65a0d0f9a
Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.
That KDE patch no longer applies, but the code seems to take KDE5 into
account already. CC @ttuegel.
Added configurations to `bumblebee` package to easy multiple monitors on Optimus
machines.
The behaviour of the default `bumblebee` package hasn't change, so this change
is backwards compatible. Users who want to connect a monitor to their discrete
card should use the package `bumblebee_display` instead.
Also added new configuration option to nixos bumblebee module:
```
hardware.bumblebee.connectDisplay = true
```
will enable the new configuration, but the default is still false.
Using primusrun will work as expected in a multilib environment. Even if the initial program
executes a antoehr program of the another architecture. Assuming the program does not modify
LD_LIBRARY_PATH inappropriately.
This does not update virtualgl for seemless multilib. I was unable to get a mixed 64/32 bit
environment to work with VirtualGL. The mechanism VirtualGL uses to inject the fake GL library would
fail if both 32bit and 64 bit libraries were in the environment. Instead the bumblebee package
creates a optirun32 executable that can be used to run a 32bit executable with optimus on a 64 bit
host. This is not created if the host is 32bit.
For my usage, gaming under wine, the primusrun executable works as expected regardless of
32bit/64bit.
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.
Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
Version 0.11.6 was the latest version that I was able to get building
and running on NixOS. Unfortunately my previous commit for 0.12.5 was
an error and incomplete.
* Bump bumblebee to 3.2.1
* Remove config.patch - options it added can be passed to ./configure now
* Remove the provided xorg.conf
Provided xorg.conf was causing problems for some users,
and Bumblebee provides its own default configuration anyway.
* Make secondary X11 log to /var/log/X.bumblebee.log
* Add a module for bumblebee
* Remove package name
* Start with upper case letter
* Remove trailing period
Also reword some descriptions and move some long descriptions to
longDescription.
I'm not touching generated packages.
There are many more packages to fix, this is just a start.
Rules:
* Don't repeat the package name (not always that easy...)
* Start with capital letter
* Don't end with full stop
* Don't start with "The ..." or "A ..."
I've also added descriptions to some packages and rewritten others.
Wow, this is one of the most dangerous programs I've seen in a while. It not
only tries to probe for a package manager to install dependencies but also
tries to execute a whole bunch of programs in $PATH. That's why I decided to
override the postFixup phase for now in order to get rid of the current $PATH
and meanwhile getting the basics working.
So, I'm still not sure how to do the best implementation here on NixOS without
allowing winswitch to be too invasive and without restricting it too much so
that it's of no use.
But let's figure that out once we trimmed down the radiation level of this
"living" thing ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
It still builds, but it's a pythonPackage so who knows if it works
right. Was breaking the tarball, though.
Signed-off-by: Shea Levy <shea@shealevy.com>
This is not needed to run XPRA, but gets rid of a few nasty errors.
XPRA is using the notify library to display nice desktop notifications, so there
might be users who actually like to have those funny things.
Cython is not required in order to run XPRA, so we now explicitly specify what
should be put into PYTHONPATH instead of using the PYTHONPATH which is set
during build time.
That way we don't get unnecessary stuff in /nix/store, like the mentioned
cython compiler/interpreter.
This is because the original version is no longer in development, as stated on
the website at http://code.google.com/p/partiwm/wiki/xpra:
"This project is in deep hibernation; I haven't had time to devote for several
years now. If you are looking for xpra, you may prefer Antoine Martin's fork,
which receives more support. It is available at: http://xpra.org/"
So I guess its safe to switch over to that fork.
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.
See the comments in bumblebee/default.nix
svn path=/nixpkgs/trunk/; revision=32036
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.
svn path=/nixpkgs/trunk/; revision=22814
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
packages.
* Renamed several files to `default.nix'. As a general rule, version
numbers should only be included in the filename when there is a
reason to keep multiple versions of a package in Nixpkgs.
Otherwise, it just makes it harder to update the package.
svn path=/nixpkgs/trunk/; revision=18403
Some of these should be longDescriptions, but most others just
shouldn't contain newlines. E.g. write
description = "Bla";
and not
description = ''
Bla
'';
This pollutes "nix-env -qa --description" output.
svn path=/nixpkgs/trunk/; revision=14310
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.
Also removed several
buildInputs = [];
lines.
svn path=/nixpkgs/trunk/; revision=10415
