diff --git a/.gitignore b/.gitignore
index 6405b7860f2966105407bcd7f34ed64801c44e3b..b2d5a9aa5bd76e5f6382177be5b49519b678cd82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
*~
,*
+.*.swp
+.*.swo
+cpan-info
+cpan_tmp/
+result
diff --git a/doc/language-support.xml b/doc/language-support.xml
index dc63dd685038ace12bee5f5307207340f620d1aa..6cc028c0b0a22e7b2b2a2de5314b9f004024131f 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter.
Nixpkgs provides a function buildPerlPackage,
a generic package builder function for any Perl package that has a
standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic.
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic">pkgs/development/perl-modules/generic.
Perl packages from CPAN are defined in pkgs/perl-packages.nix,
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/perl-packages.nix,
rather than pkgs/all-packages.nix. Most Perl
packages are so straight-forward to build that they are defined here
directly, rather than having a separate function for each package
@@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec {
which many Python packages do nowadays, can be built very simply using
the buildPythonPackage function. This function is
implemented
- in pkgs/development/python-modules/generic/default.nix
+ in pkgs/development/python-modules/generic/default.nix
and works similarly to buildPerlPackage. (See
for details.)
@@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec {
Python packages that use buildPythonPackage are
defined
- in pkgs/top-level/python-packages.nix.
+ in pkgs/top-level/python-packages.nix.
Most of them are simple. For example:
@@ -196,17 +196,18 @@ twisted = buildPythonPackage {
-
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in
---- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in
---- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200
-+++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
- ]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in
---- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in
---- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in
---- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in
---- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in
---- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in
---- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in
---- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -24,7 +24,7 @@
-
- -->
-
--
- ]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in
---- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in
---- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -24,7 +24,7 @@
-
- -->
-
--
- ]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in
---- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in
---- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200
-+++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
- ]>
-@@ -280,7 +280,7 @@
-
-
-
--
-+
-
-
-
-@@ -570,7 +570,7 @@
- to the background.
-
-
--
-+
-
-
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in
---- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in
---- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in
---- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in
---- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200
-@@ -24,7 +24,7 @@
-
- -->
-
--
-
diff --git a/pkgs/applications/virtualization/qemu/0.11.0.nix b/pkgs/applications/virtualization/qemu/0.11.0.nix
deleted file mode 100644
index bbcf180645257143387956a78ab756920c6d880e..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/0.11.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, SDL, zlib, which}:
-
-stdenv.mkDerivation {
- name = "qemu-0.11.0";
-
- src = fetchurl {
- url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz;
- sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw";
- };
-
- patchFlags = "-p2";
-
- buildInputs = [SDL zlib which];
-
- meta = {
- description = "QEmu processor emulator";
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/0.13.nix b/pkgs/applications/virtualization/qemu/0.13.nix
deleted file mode 100644
index e1b6367496960f1b5c0fba5ff94581ff728d8bd0..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/0.13.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, SDL, zlib, which, ncurses }:
-
-stdenv.mkDerivation rec {
- name = "qemu-0.13.0";
-
- src = fetchurl {
- url = "mirror://savannah/releases/qemu/${name}.tar.gz";
- sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy";
- };
-
- buildInputs = [ SDL zlib which ncurses ];
-
- meta = {
- description = "QEmu processor emulator";
- license = "GPLv2+";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix
deleted file mode 100644
index f75b212924305b033987798906d3458ec2171431..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/0.15.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
-
-stdenv.mkDerivation rec {
- name = "qemu-0.15.1";
-
- src = fetchurl {
- url = "http://wiki.qemu.org/download/${name}.tar.gz";
- sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
- };
-
- buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
-
- meta = {
- description = "QEmu processor emulator";
- license = "GPLv2+";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix
deleted file mode 100644
index daa0b74ee329e418f52bb138ce2b650a83e48c12..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/1.0.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
-
-stdenv.mkDerivation rec {
- name = "qemu-1.0.1";
-
- src = fetchurl {
- url = "http://wiki.qemu.org/download/${name}.tar.gz";
- sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r";
- };
-
- buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
-
- meta = {
- description = "QEmu processor emulator";
- license = "GPLv2+";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b1165b3535b92c389b13fdf7a504ceb58f0e5357
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
+
+stdenv.mkDerivation rec {
+ name = "qemu-1.4.0";
+
+ src = fetchurl {
+ url = "http://wiki.qemu.org/download/${name}.tar.bz2";
+ sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
+ };
+
+ buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "QEmu processor emulator";
+ license = "GPLv2+";
+ maintainers = with stdenv.lib.maintainers; [ viric shlevy ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/virtualization/qemu/svn-6642.nix b/pkgs/applications/virtualization/qemu/svn-6642.nix
deleted file mode 100644
index 32d67234ba735517188cc2555aa13f29cd5bedeb..0000000000000000000000000000000000000000
--- a/pkgs/applications/virtualization/qemu/svn-6642.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchsvn, SDL, zlib, which}:
-
-stdenv.mkDerivation {
- name = "qemu-svn-6642";
-
- src = fetchsvn {
- url = "svn://svn.sv.gnu.org/qemu/trunk";
- rev = "6642";
- sha256 = "12445ad91feb72eecd1db0d4319a8fa5d7dc971b89228bd0e121b49c5da9705e";
- };
-
- patchFlags = "-p2";
-
- buildInputs = [SDL zlib which];
-
- meta = {
- description = "QEmu processor emulator";
- };
-}
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 79ea777eeaddb35590c00af8a80372c8c8cdec2e..195ee5d45c01ac55d03bbc0dd27e4fb53a950318 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildPhase = "make";
- buildNativeInputs = [ makeWrapper pythonPackages.wrapPython ];
+ nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
# patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall
# example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 2bb2adaa00ac716b23ea6f298b4d0086218c4c72..26b16375e659551daccba4b17f570e106b06dbd4 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
- libvirt libxml2Python
+ libvirt libxml2Python urlgrabber
];
buildInputs =
@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
buildPhase = "python setup.py build";
installPhase =
- ''
+ ''
python setup.py install --prefix="$out";
+ wrapPythonPrograms
'';
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1067300a2ef66b03720d19dd42799de31e479b65..3dd020dfa105f8e148f483853b55fedd81865de0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null
+, enableExtensionPack ? false, requireFile ? null, patchelf ? null
}:
with stdenv.lib;
let
- version = "4.1.20";
+ version = "4.2.12";
+ extpackRevision = "84980";
forEachModule = action: ''
for mod in \
@@ -29,24 +31,32 @@ let
done
'';
+ extensionPack = requireFile {
+ name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+ + ".vbox-extpack";
+ # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
+ sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4";
+ url = "https://www.virtualbox.org/wiki/Downloads";
+ };
+
in stdenv.mkDerivation {
- name = "virtualbox-${version}-${kernel.version}";
+ name = "virtualbox-${version}-${kernelDev.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
- sha256 = "b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb";
+ sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6";
};
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
- libcap glib kernel python alsaLib curl pam xorriso makeself perl
+ libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
- patchPhase = ''
+ prePatch = ''
set -x
- MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
+ MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
@@ -106,10 +116,25 @@ in stdenv.mkDerivation {
ln -s "$libexec/$file" $out/bin/$file
done
+ ${optionalString enableExtensionPack ''
+ "$libexec/VBoxExtPackHelperApp" install \
+ --base-dir "$libexec/ExtensionPacks" \
+ --cert-dir "$libexec/ExtPackCertificates" \
+ --name "Oracle VM VirtualBox Extension Pack" \
+ --tarball "${extensionPack}" \
+ --sha-256 "${extensionPack.outputHash}"
+ ''}
+
# Create and fix desktop item
mkdir -p $out/share/applications
sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
ln -sfv $libexec/virtualbox.desktop $out/share/applications
+ # Icons
+ mkdir -p $out/share/icons/hicolor
+ for size in `ls -1 $libexec/icons`; do
+ mkdir -p $out/share/icons/hicolor/$size/apps
+ ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps
+ done
'';
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5b207e2e799fcfd0eadd7ab75fe3bb7418fe92ea..f3d7c18a2c692f3ddc45cfe2ee8432847df55346 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
+{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
+, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
+, dbus }:
-let version = "4.1.18"; in
+let version = "4.2.12"; in
stdenv.mkDerivation {
- name = "VirtualBox-GuestAdditions-${version}";
+ name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
+
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb";
+ sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8";
};
- KERN_DIR = "${kernel}/lib/modules/*/build";
- buildInputs = [ patchelf cdrkit makeWrapper ];
+
+ KERN_DIR = "${kernelDev}/lib/modules/*/build";
+
+ buildInputs = [ patchelf cdrkit makeWrapper dbus ];
installPhase = ''
mkdir -p $out
@@ -53,7 +57,7 @@ stdenv.mkDerivation {
cd ..
# Change the interpreter for various binaries
- for i in sbin/VBoxService bin/{VBoxClient,VBoxControl}
+ for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
do
${if stdenv.system == "i686-linux" then ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
@@ -63,14 +67,12 @@ stdenv.mkDerivation {
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
done
- # Change rpath for various binaries and libraries
- patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
-
for i in lib/VBoxOGL*.so
do
- patchelf --set-rpath $out/lib $i
+ patchelf --set-rpath $out/lib:${dbus}/lib $i
done
# Remove references to /usr from various scripts and files
@@ -79,6 +81,7 @@ stdenv.mkDerivation {
# Install binaries
mkdir -p $out/sbin
+ install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf
install -m 755 sbin/VBoxService $out/sbin
mkdir -p $out/bin
@@ -101,9 +104,7 @@ stdenv.mkDerivation {
# Install Xorg drivers
mkdir -p $out/lib/xorg/modules/{drivers,input}
- install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
- # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
- #install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
+ install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
# Install kernel modules
cd src
@@ -111,7 +112,7 @@ stdenv.mkDerivation {
for i in *
do
cd $i
- kernelVersion=$(cd ${kernel}/lib/modules; ls)
+ kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"
diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index d898daad2a77a786671cd7951431b683f269d1e7..3cb16a6b4425ea702fb54a1b32fe82ef5c72d260 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
let
- version = "4.1.2";
+ version = "4.0.3";
libDir = if stdenv.is64bit then "lib64" else "lib";
@@ -30,24 +30,23 @@ let
}
];
- ipxeSrc =
- { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz;
- sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723";
- };
-in
+in
stdenv.mkDerivation {
name = "xen-${version}";
src = fetchurl {
url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
- sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d";
+ sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5";
};
patches =
[ # Xen looks for headers in /usr/include and for libraries using
# ldconfig. Don't do that.
./has-header.patch
+
+ # GCC 4.5 compatibility.
+ ./gcc-4.5.patch
];
buildInputs =
@@ -80,6 +79,9 @@ stdenv.mkDerivation {
substituteInPlace tools/xenstat/Makefile \
--replace /usr/include/curses.h ${ncurses}/include/curses.h
+ substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \
+ --replace /usr/include/pci ${pciutils}/include/pci
+
# Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
# print the GCC version number properly.
substituteInPlace xen/Makefile \
@@ -103,18 +105,12 @@ stdenv.mkDerivation {
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
--replace /bin/ls ls
- grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g'
-
# Xen's stubdoms need various sources that it usually fetches at
# build time using wget. We can't have that.
${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
cp ${src} stubdom/${src.name}
'')}
- ${let src = fetchurl ipxeSrc; in ''
- cp ${src} tools/firmware/etherboot/ipxe.tar.gz
- ''}
-
# Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
mkdir -p tools/include/gnu
touch tools/include/gnu/stubs-32.h
diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a8412d69fd3f9076098ae3e95920e6bb9f4694fe
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/gcc-4.5.patch
@@ -0,0 +1,39 @@
+http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html
+
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c
+--- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100
+@@ -281,7 +281,7 @@
+ /*
+ * Mark portion of the address space read only.
+ */
+-extern void shared_info;
++extern char shared_info[PAGE_SIZE];
+ static void set_readonly(void *text, void *etext)
+ {
+ unsigned long start_address =
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk
+--- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100
+@@ -10,6 +10,7 @@
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
++DEF_CFLAGS += -Wno-uninitialized
+ DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
+
+ DEF_ASFLAGS += -D__ASSEMBLY__
+diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c
+--- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100
+@@ -25,8 +25,8 @@
+
+
+
+-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
+-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
++#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
++#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
+ #define GRANT_INVALID_REF 0
+
+
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 5e24a42d3a729fe2c79f3e164796f154433b5376..61f2145ff33c3be0be9ec640bc83627ca1cdb64f 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -48,3 +48,4 @@ stdenv.mkDerivation rec {
platforms = with stdenv.lib.platforms; linux;
};
}
+
diff --git a/pkgs/applications/window-managers/compiz/bcop.nix b/pkgs/applications/window-managers/compiz/bcop.nix
deleted file mode 100644
index 254393d4c7fcf456dc86d8631f736e9e614b22f1..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/bcop.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxslt }:
-
-stdenv.mkDerivation rec {
- name = "compiz-bcop-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2";
- sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk";
- };
-
- buildInputs = [ pkgconfig libxslt ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Code generator for Compiz plugins";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/ccsm.nix b/pkgs/applications/window-managers/compiz/ccsm.nix
deleted file mode 100644
index 0406a170d1900a223bc0714d2ed0784c4a5164dd..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/ccsm.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, intltool, gtk
-, python, pygtk, pygobject, pycairo, compizconfig_python }:
-
-stdenv.mkDerivation rec {
- name = "ccsm-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2";
- sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6";
- };
-
- buildInputs = [ makeWrapper python intltool gtk ];
-
- buildPhase = "python setup.py build --prefix=$out";
-
- pythonDeps = [ pygtk pygobject pycairo compizconfig_python ];
-
- installPhase =
- ''
- python setup.py install --prefix=$out
-
- wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \
- "$(toPythonPath "$pythonDeps $out")"
- '';
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Compiz settings manager";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/config-python.nix b/pkgs/applications/window-managers/compiz/config-python.nix
deleted file mode 100644
index 4de7fb41a48868bf031f440a800efbc321c4ac16..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/config-python.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib
-, python, pyrex }:
-
-stdenv.mkDerivation rec {
- name = "compizconfig-python-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2";
- sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37";
- };
-
- buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ];
-
- NIX_LDFLAGS = "-lcompizconfig";
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Python interface to the Compiz configuration";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix
deleted file mode 100644
index d4a5b79b7fb3cc227acc4d52ce1f812cd36825fd..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/core.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt
-, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation {
- name = "compiz-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2";
- sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4";
- };
-
- patches =
- [ # Allow the path to the Compiz plugin library and metadata
- # directories to be overriden through $COMPIZ_PLUGINDIR and
- # $COMPIZ_METADATADIR, respectively.
- ./plugindir-core.patch
-
- # Fix compilation with recent GTK versions.
- ./gdk-deprecated.patch
- ];
-
- buildInputs =
- [ intltool pkgconfig libpng glib
- gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2
- ];
-
- propagatedBuildInputs =
- [ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender
- xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama
- libstartup_notification mesa libxml2 libxslt
- ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "A compositing window manager";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..46aa6e4d77eb454d93a346040964245795b6f09a
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -0,0 +1,60 @@
+{stdenv, fetchurl, cmake, pkgconfig
+, libXrender, renderproto, gtk, libwnck, pango, cairo
+, GConf, libXdamage, damageproto, libxml2, libxslt, glibmm
+, metacity
+, libstartup_notification, libpthreadstubs, libxcb, intltool
+, ORBit2, libXau
+, dbus, dbus_glib, librsvg, mesa
+, libXdmcp, libnotify, python
+, hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf, pygtk, pythonDBus
+, xdg_utils
+, gettext, boost, pyrex
+, makeWrapper
+}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="compiz";
+ version="0.9.9.0";
+ name="compiz-${version}";
+ url="https://launchpad.net/compiz/0.9.9/${version}/+download/${name}.tar.bz2";
+ sha256="0nxv9lv0zwzs82p2d5g38sbvzbqgfs837xdgwc26lh5wdv31d93s";
+ };
+ buildInputs = [cmake pkgconfig
+ libXrender renderproto gtk libwnck pango cairo
+ GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification
+ metacity
+ libpthreadstubs libxcb intltool
+ ORBit2 libXau
+ dbus dbus_glib librsvg mesa
+ libXdmcp libnotify python
+ hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk pythonDBus
+ 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"
+ '';
+
+ meta = {
+ description = "Compoziting window manager";
+ homepage = "http://launchpad.net/compiz/";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ inherit (s) version;
+ };
+}
diff --git a/pkgs/applications/window-managers/compiz/default.upstream b/pkgs/applications/window-managers/compiz/default.upstream
new file mode 100644
index 0000000000000000000000000000000000000000..b7fc98bd1263a1975dbbe48ccafb259e9b2d1d4f
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/default.upstream
@@ -0,0 +1 @@
+url https://launchpad.net/compiz/+download
diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch
deleted file mode 100644
index d80a5514ee9da886b3a8740e2660fa34cd127ebd..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
---- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
-@@ -31,10 +31,6 @@
- #include
- #include
-
--#ifndef GDK_DISABLE_DEPRECATED
--#define GDK_DISABLE_DEPRECATED
--#endif
--
- #ifndef GTK_DISABLE_DEPRECATED
- #define GTK_DISABLE_DEPRECATED
- #endif
diff --git a/pkgs/applications/window-managers/compiz/libcompizconfig.nix b/pkgs/applications/window-managers/compiz/libcompizconfig.nix
deleted file mode 100644
index 51d459e7a36636c4e2719e66252c842ebd80d96b..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/libcompizconfig.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }:
-
-stdenv.mkDerivation rec {
- name = "libcompizconfig-0.8.4";
-
- src = fetchurl {
- url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2";
- sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1";
- };
-
- patches =
- [ # See ./core.nix.
- ./plugindir-libcompizconfig.patch
- ];
-
- buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Compiz configuration library";
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/plugindir-core.patch b/pkgs/applications/window-managers/compiz/plugindir-core.patch
deleted file mode 100644
index 5a242e66088f5559494b891aeb7fdfe81162c197..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/plugindir-core.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
---- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
-@@ -146,7 +146,7 @@
- compAddMetadataFromFile (CompMetadata *metadata,
- const char *file)
- {
-- char *home;
-+ char *home, *metadatadir;
- Bool status = FALSE;
-
- home = getenv ("HOME");
-@@ -163,7 +163,10 @@
- }
- }
-
-- status |= addMetadataFromFilename (metadata, METADATADIR, file);
-+ metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+
-+ status |= addMetadataFromFilename (metadata, metadatadir, file);
- if (!status)
- {
- compLogMessage ("core", CompLogLevelWarn,
-diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
---- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
-+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
-@@ -579,7 +579,10 @@
- }
- }
-
-- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
-+ plugindir = getenv("COMPIZ_PLUGINDIR");
-+ if (!plugindir) plugindir = PLUGINDIR;
-+
-+ status = (*loaderLoadPlugin) (p, plugindir, name);
- if (status)
- return p;
-
diff --git a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch b/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
deleted file mode 100644
index 207816a3c518e54baf92bb9e1c488a4b9adf14bb..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp
---- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200
-+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200
-@@ -3004,7 +3004,10 @@
- }
- }
-
-- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR);
-+ char *metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+
-+ loadPluginFromXMLFile (context, xmlName, metadatadir);
- free (xmlName);
- }
-
-@@ -3031,7 +3034,10 @@
- free (homeplugins);
- }
- }
-- loadPluginsFromXMLFiles (context, (char *)METADATADIR);
-+
-+ char *metadatadir = getenv("COMPIZ_METADATADIR");
-+ if (!metadatadir) metadatadir = METADATADIR;
-+ loadPluginsFromXMLFiles (context, metadatadir);
-
- if (home && strlen (home))
- {
-@@ -3043,7 +3049,10 @@
- free (homeplugins);
- }
- }
-- loadPluginsFromName (context, (char *)PLUGINDIR);
-+
-+ char *plugindir = getenv("COMPIZ_PLUGINDIR");
-+ if (!plugindir) plugindir = PLUGINDIR;
-+ loadPluginsFromName (context, plugindir);
- }
-
- static void
diff --git a/pkgs/applications/window-managers/compiz/plugins-extra.nix b/pkgs/applications/window-managers/compiz/plugins-extra.nix
deleted file mode 100644
index 8852ebd474ed795000e548703da287f84e34c785..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/plugins-extra.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
-, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation rec {
- name = "compiz-plugins-extra-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
- sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1";
- };
-
- patches =
- [ # Support scaling wallpapers to the maximum size while still
- # respecting the aspect ratio.
- ./wallpaper-maxpect.patch
- ];
-
- NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz";
-
- buildInputs =
- [ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Extra plugins for Compiz";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/plugins-main.nix b/pkgs/applications/window-managers/compiz/plugins-main.nix
deleted file mode 100644
index ea1c01e7414bbb7551ef758c3d7632f64a957d4c..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/plugins-main.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
-, getopt, libjpeg, cairo, pango, gnome }:
-
-let version = "0.8.6"; in
-
-stdenv.mkDerivation rec {
- name = "compiz-plugins-main-${version}";
-
- src = fetchurl {
- url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
- sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36";
- };
-
- buildInputs =
- [ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ];
-
- meta = {
- homepage = http://www.compiz.org/;
- description = "Main plugins for Compiz";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch b/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
deleted file mode 100644
index 8130dff1dba44b8c37a5e2f918d330a6561e09af..0000000000000000000000000000000000000000
--- a/pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in
---- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200
-+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200
-@@ -24,7 +24,7 @@
- <_long>Image position.
- int
- 0
-- 4
-+ 5
-
- 0
- <_name>Scale and Crop
-@@ -45,6 +45,10 @@
- 4
- <_name>Center Tiled
-
-+
-+ 5
-+ <_name>Centered Maxpect
-+
-
-