compiz: drop
This commit is contained in:
Graham Christensen
parent
7978edad53
commit
128cdeffd0
|
|
@ -254,7 +254,7 @@ bound to the variable name <varname>e2fsprogs</varname> in
|
|||
dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>
|
||||
|
||||
<listitem><para>If a package is not a release but a commit from a repository, then
|
||||
the version part of the name <emphasis>must</emphasis> be the date of that
|
||||
the version part of the name <emphasis>must</emphasis> be the date of that
|
||||
(fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.
|
||||
Also append <literal>"unstable"</literal> to the name - e.g.,
|
||||
<literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>
|
||||
|
|
@ -456,7 +456,7 @@ splitting up an existing category.</para>
|
|||
<varlistentry>
|
||||
<term>If it’s a <emphasis>window manager</emphasis>:</term>
|
||||
<listitem>
|
||||
<para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
|
||||
<para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
|
|
@ -661,9 +661,9 @@ src = fetchFromGitHub {
|
|||
</section>
|
||||
|
||||
<section xml:id="sec-patches"><title>Patches</title>
|
||||
<para>Only patches that are unique to <literal>nixpkgs</literal> should be
|
||||
<para>Only patches that are unique to <literal>nixpkgs</literal> should be
|
||||
included in <literal>nixpkgs</literal> source.</para>
|
||||
<para>Patches available online should be retrieved using
|
||||
<para>Patches available online should be retrieved using
|
||||
<literal>fetchpatch</literal>.</para>
|
||||
<para>
|
||||
<programlisting>
|
||||
|
|
|
|||
|
|
@ -165,6 +165,12 @@ rmdir /var/lib/ipfs/.ipfs
|
|||
Refer to the description of the options for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>compiz</literal> window manager and package was
|
||||
removed. The system support had been broken for several years.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
||||
<para>Other notable improvements:</para>
|
||||
|
|
@ -210,7 +216,7 @@ rmdir /var/lib/ipfs/.ipfs
|
|||
<listitem>
|
||||
<para>
|
||||
Nixpkgs overlays may now be specified with a file as well as a directory. The
|
||||
value of <literal><nixpkgs-overlays></literal> may be a file, and
|
||||
value of <literal><nixpkgs-overlays></literal> may be a file, and
|
||||
<filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
|
||||
<filename>~/.config/nixpkgs/overalys</filename> directory.
|
||||
</para>
|
||||
|
|
|
|||
|
|
@ -630,7 +630,6 @@
|
|||
./services/x11/redshift.nix
|
||||
./services/x11/urxvtd.nix
|
||||
./services/x11/window-managers/awesome.nix
|
||||
#./services/x11/window-managers/compiz.nix
|
||||
./services/x11/window-managers/default.nix
|
||||
./services/x11/window-managers/fluxbox.nix
|
||||
./services/x11/window-managers/icewm.nix
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.xserver.windowManager.compiz;
|
||||
xorg = config.services.xserver.package;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
options = {
|
||||
|
||||
services.xserver.windowManager.compiz = {
|
||||
|
||||
enable = mkEnableOption "compiz";
|
||||
|
||||
renderingFlag = mkOption {
|
||||
default = "";
|
||||
example = "--indirect-rendering";
|
||||
description = "Pass the <option>--indirect-rendering</option> flag to Compiz.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.xserver.windowManager.session = singleton
|
||||
{ name = "compiz";
|
||||
start =
|
||||
''
|
||||
# Start Compiz using the flat-file configuration backend
|
||||
# (ccp).
|
||||
export COMPIZ_PLUGINDIR=${config.system.path}/lib/compiz
|
||||
export COMPIZ_METADATADIR=${config.system.path}/share/compiz
|
||||
${pkgs.compiz}/bin/compiz ccp ${cfg.renderingFlag} &
|
||||
|
||||
# Start GTK-style window decorator.
|
||||
${pkgs.compiz}/bin/gtk-window-decorator &
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages =
|
||||
[ pkgs.compiz
|
||||
pkgs.compiz_ccsm
|
||||
pkgs.compiz_plugins_main
|
||||
pkgs.compiz_plugins_extra
|
||||
pkgs.libcompizconfig # for the "ccp" plugin
|
||||
];
|
||||
|
||||
environment.pathsToLink = [ "/lib/compiz" "/share/compiz" ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -11,7 +11,6 @@ in
|
|||
./2bwm.nix
|
||||
./afterstep.nix
|
||||
./bspwm.nix
|
||||
./compiz.nix
|
||||
./dwm.nix
|
||||
./exwm.nix
|
||||
./fluxbox.nix
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig
|
||||
, libXrender, renderproto, gtk2, libwnck, pango, cairo
|
||||
, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
|
||||
, metacity
|
||||
, libstartup_notification, libpthreadstubs, libxcb, intltool
|
||||
, ORBit2, libXau, libICE, libSM
|
||||
, dbus, dbus_glib, librsvg, mesa
|
||||
, libXdmcp, libnotify, python2Packages
|
||||
, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf
|
||||
, xdg_utils
|
||||
, gettext, boost, pyrex
|
||||
, makeWrapper
|
||||
}:
|
||||
let
|
||||
# FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper
|
||||
inherit (python2Packages) python dbus-python pygtk;
|
||||
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="compiz";
|
||||
version="0.9.13.1";
|
||||
name="${baseName}-${version}";
|
||||
hash="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";
|
||||
url="https://launchpad.net/compiz/0.9.13/0.9.13.1/+download/compiz-0.9.13.1.tar.bz2";
|
||||
sha256="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";
|
||||
};
|
||||
buildInputs = [cmake pkgconfig
|
||||
libXrender renderproto gtk2 libwnck pango cairo
|
||||
GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
|
||||
metacity
|
||||
libpthreadstubs libxcb intltool
|
||||
ORBit2 libXau libICE libSM
|
||||
dbus dbus_glib librsvg mesa
|
||||
libXdmcp libnotify python
|
||||
hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk dbus-python
|
||||
xdg_utils
|
||||
gettext boost pyrex
|
||||
makeWrapper
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (s) name version;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
inherit buildInputs;
|
||||
|
||||
NIX_CFLAGS_COMPILE = " -Wno-error ";
|
||||
NIX_CFLAGS_LINK = "-lm -ldl -pthread -lutil";
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/ccsm" \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
|
||||
'';
|
||||
|
||||
# automatic moving fails, perhaps due to having two $out/lib*/pkgconfig
|
||||
dontMoveLib64 = true;
|
||||
|
||||
meta = {
|
||||
description = "Compoziting window manager";
|
||||
homepage = https://launchpad.net/compiz/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (s) version;
|
||||
};
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
url https://launchpad.net/compiz/+download
|
||||
|
|
@ -13690,10 +13690,6 @@ with pkgs;
|
|||
|
||||
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
|
||||
|
||||
compiz = callPackage ../applications/window-managers/compiz {
|
||||
inherit (gnome2) GConf ORBit2 metacity;
|
||||
};
|
||||
|
||||
confclerk = callPackage ../applications/misc/confclerk { };
|
||||
|
||||
copyq = callPackage ../applications/misc/copyq { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user