Commit Graph

64 Commits

Author SHA1 Message Date
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Nathan
b0caf68bff
maintainer-list.nix: remove ndowens 2019-12-26 16:47:41 -05:00
Doron Behar
ab9fd67b68 awesome: Make sure it compiles with luajit 2019-10-17 19:03:19 +03:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Stefano Mazzucco
75886e3b47 awesome: add optional gtk3 support
Add optional gtk3 support to Awesome so that the `beautiful.gtk` module can be
used.

The `beautiful.gtk` uses `lgi` to obtain Gtk via gobject-introspect:

    return require('lgi').Gtk

Since the current build does not include the typelib files needed, the above
call fails.

It turns out that both `gtk3` and `atk` (Accessibility toolkit) are needed, so
this commit adds them as optional build inputs.

Setting `gtk3Support` to `true` e.g. in an overlay will make `beautiful.gtk`
work at the cost of an increased closure size (currently 99.6M vs 223.4M).

Fixes https://github.com/NixOS/nixpkgs/issues/60538
2019-05-11 17:36:54 +01:00
Will Dietz
d7ff576529
Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness
luarocks-nix,luaPackages: formatting and additions; awesome: docs!
2019-05-10 16:56:58 -05:00
Stefano Mazzucco
88f84c08d7 awesome: use makeWrapper rather than wrapProgram
Using wrapProgram makes so that the generated "awesome" wrapper duplicates its
command line options at every restart.

As @psychon puts it:

> AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used
> to generate a wrapper around the real binary. wrapProgram calls makeWrapper
> with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again
> on restart. Without this --argv0 awesomeWM would directly restart itself
> instead of the wrapper, I think.
2019-05-06 21:08:55 +01:00
Will Dietz
725585cfca awesome: generate docs, put in separate output
Especially useful when using non-release versions,
but good to have locally regardless.
2019-04-28 10:14:05 -05:00
Stefano Mazzucco
c973e15fb6 awesome: refactor LUA_PATH env var and don't expose it at runtime
This commit partly reinstates changes from 5465d6f that had been somehow
reverted in 17d3eb2.  Also, a comment has been added in the hope that future
changes won't do the same.

Additionally, refactor the LUA_PATH env var to ensure that the internal lgi lua
files can't be required explicitly and to avoid possible name clashes (this
fixes issue #60232).

Finally, rather than using prepending `?.lua` append `;;` to LUA_PATH. Quoting
@psychon:

> This is interpreted by Lua as "add the default search path here" (which does
> indeed contain ?.lua, but also contains more).

Testing done:

- Build with `nix-build -I /path/to/repo -A awesome`
- Start an X session with xterm only
- Start xephyr, e.g. `Xephyr :1 -name xephyr -screen 512x384 -ac -br -noreset &`
- Run awesome like `DISPLAY=:1.0 ./result/bin/awesome`. Additionally, add
  `--search` options to expose lua modules that have a name clash with lgi's
  internal ones (see #60232 for more details) and `require` them in `rc.lua` to
  prove that they are loaded correctly
2019-04-27 15:49:43 +01:00
Will Dietz
ff5676a216 awesome: drop asciidoc, no longer needed when moved to asciidoctor 2019-02-14 03:24:17 -06:00
Will Dietz
17d3eb2c9a awesome: fixup lua paths, don't add random utilities to PATH
Lua path changes needed to fix build,
removing PATH clutter while visiting this code since doesn't belong.
2019-01-28 21:05:56 -06:00
Will Dietz
cdb9adb872 awesome: 4.2 -> 4.3 2019-01-28 20:56:35 -06:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Uli Schlachter
ba12a867f7 awesome: Remove $LD_LIBRARY_PATH handling
I have no idea why gobjectIntrospection even was in here. The only
library in there, libgirepository-1.0.so, is not used by awesome. It is
only used by lgi.so and that means it should be found via its RPATH.

The Pango path is not needed in $LD_LIBRARY_PATH ever since
gobjectIntrospection started patching .typelib files with absolute
paths. Relevant commits are 36bef2b267 from 2014
("gobject-introspection: refer to shlibs with absolute paths in
typelibs") and c420de6b05 from 2016 ("gobject-introspection: Fix
patching shared objects").

The above patches did not work for cairo, because cairo's typelib is a
bit "special". However, this was fixed by e44038bcca some days ago
("gobjectIntrospection: use absolute path for cairo GIR").

Thus, setting $GI_TYPELIB_PATH is enough so that all needed libraries
are found.

Fixes: https://github.com/NixOS/nixpkgs/issues/14164
Signed-off-by: Uli Schlachter <psychon@znc.in>
2018-01-25 16:46:12 +01:00
Uli Schlachter
5465d6f7de awesome: Use --search instead of $LUA_PATH/$LUA_CPATH
Instead of polluting the environment with environment variables which
are inherited by processes spawned from awesome, use the command line
argument "--search" to add things to the search path.

cc #33169
2018-01-02 17:24:56 +00:00
Joerg Thalheim
574edcd6b2 awesome: fix LUA_PATH/LUA_CPATH to lgi
Otherwise it would not start.
2017-11-28 18:37:19 +00:00
Yurii Rashkovskii
824b30a715 awesome: specify version
By default, awesome will use "devel" as a version name
(or `git describe`). This has led to awesome always
showing "devel" for its version.

Some extensions depend on version information to figure
out what features they can use.

This change overrides the version for the build from the
derivations' `version` attribute.
2017-09-17 16:02:17 -07:00
romildo
47689bf706 awesome: 4.1 -> 4.2
- update to version 4.2
- remove 1639.patch, which has been integrated in release
2017-07-29 10:32:42 -03:00
Samuel Dionne-Riel
14520e7b4b awesome: Allows awesome to load svg images.
Awesome can load SVG images, just like it can do PNG, through gdk.

The support for SVG images through GDK needs librvsg.

This commits adds the plumbing necessary in the wrapper that makes
awesome be able to load SVG images.

Without this, awesome will not load SVG images. The related error message is:

 > Couldn't recognize the image file format for file

Which comes from gdk.
2017-05-14 17:10:16 -04:00
romildo
b1a9bcfb16 awesome: menubar should take XDG_HOME_DIR and XDG_DATA_DIRS into account 2017-03-23 17:52:18 +01:00
ndowens
6a851cde94 awesomewm: 4.0 -> 4.1 2017-03-19 10:26:22 -05:00
ndowens
e67416f7e2 awesome-4.0: Add hicolor-icon-theme for theme support
Closes #22888.
2017-02-17 21:58:28 +03:00
Alexey Shmalko
b33907075f
awesome: 3.5.9 -> 4.0 2016-12-27 11:39:51 +02:00
Tuomas Tynkkynen
282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
José Romildo Malaquias
e39f9a2c11 awesome: include manual pages 2016-03-27 12:14:46 -03:00
José Romildo Malaquias
83d814f600 awesome: 3.5.8 -> 3.5.9 2016-03-09 17:50:28 -03:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
José Romildo Malaquias
866937a9f8 awesome: 3.5.7 -> 3.5.8 2016-01-31 11:34:10 -02:00
José Romildo Malaquias
d9a407a8c4 awesome: 3.5.6 -> 3.5.7 2016-01-22 15:42:52 -02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Aristid Breitkreuz
69874c27ec awesome manpage is broken in chroot builds, disable for now 2015-03-29 11:08:11 +00:00
Daniel Hahler
421e79b8d1 awesome: do not depend on rxvt_unicode, but xterm
xterm is being used as terminal in the default configuration.
2015-03-06 00:04:48 +01:00
Daniel Hahler
0f7c125ca4 awesome: 3.5.5 -> 3.5.6 2015-03-05 23:56:32 +01:00
Luca Bruno
614162ee6c Some lua and awesome improvements
- Move lgi to luaPackages
- Use luaPackages in awesome and passthru lua
- Allow to pass lua modules to the awesome WM so that those can be used in the configuration
2014-12-17 15:08:21 +01:00
Aristid Breitkreuz
982364b212 awesome: generate manpages 2014-10-11 21:56:50 +02:00
Jordan Patterson
26f2d67a65 Update Awesome WM to 3.5.5
Fix LGI test
Prefix LD_LIBRARY_PATH instead of clobbering it
2014-05-14 12:25:26 -06:00
Jason "Don" O'Conal
76ab3916de awesome-3-5: add expression and nixos module 2013-11-20 01:05:09 +00:00
Jason "Don" O'Conal
d680003157 awesome: add which to build inputs (for awesome-client) 2013-11-11 01:40:17 +00:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00