diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix deleted file mode 100644 index 07ba60cd8333..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix +++ /dev/null @@ -1,34 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2; - sha256 ="1rs5r5b6rl39vlw68i8bwm5izs5dm666kygmg1c8dy2dab0xsnkq"; - }; - buildInputs = (import ../general-dependencies.nix args); - propagatedBuildInputs = [getopt libxslt]; - configureFlags = []; - } ; - in with localDefs; -let - fixPkgconfig = fullDepEntry (" - ensureDir \$out/lib - ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig - ") [minInit doMakeInstall defEnsureDir]; - fixInterpreter = fullDepEntry (" - sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop - ") [minInit doMakeInstall]; -in -stdenv.mkDerivation rec { - name = "compiz-bcop-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare - doPropagate]); - inherit propagatedBuildInputs; - meta = { - description = " - Compiz BCOP. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix deleted file mode 100644 index d739b54a5341..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2; - sha256 ="0djdzz1m9nvwzxfaywdm90bi816nig2ybfynf48394a5hpsng3l9"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop compizConfigPython python gettext pygtk - pycairo configBackendGConf]; - configureFlags = []; - wrappedEnv = [ - "PYTHONPATH" "$(toPythonPath \$out)" - "PYTHONPATH" "\$PYTHONPATH" - "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" - ]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-settings-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/simple-ccsm")]); - meta = { - description = " - Compiz Settings Manager (simplified) -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix deleted file mode 100644 index 385819afd4c3..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2; - sha256 ="0s8difywj0ghc8c5xjxihfp8qhlhv5kyh00c2br1jh2ap5rrdfgc"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop compizConfigPython python gettext pygtk - pycairo configBackendGConf]; - configureFlags = []; - wrappedEnv = [ - "PYTHONPATH" "$(toPythonPath \$out)" - "PYTHONPATH" "\$PYTHONPATH" - "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" - ]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-settings-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]); - meta = { - description = " - Compiz Settings Manager -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix deleted file mode 100644 index d92349e238b2..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2; - sha256 ="13g8vpgkimrbp19pd475ijiwbqx3zin0nzq8636l71yaqb0kjfjn"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [libcompizconfig bcop python pyrex configBackendGConf]; - configureFlags = []; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-python-"+args.version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]); - meta = { - description = " - Compiz configuration - Python part. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix deleted file mode 100644 index f6f1f1545b03..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix +++ /dev/null @@ -1,24 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2; - sha256 ="18bcfx3c2ipj3spfr8dg07h98pw77jh28w91w6n2fd5ffr6ja9q5"; - }; - buildInputs = (import ../general-dependencies.nix args) ++ - [bcop libcompizconfig]; - configureFlags = []; - forceShare = ["man" "doc" "info" "lib/compizconfig"]; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "compizconfig-backend-GConf-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = " - Compiz configuration backend (GConf). -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix deleted file mode 100644 index bfd0810facf0..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -args : with args; -rec -{ - selectVersion = dir: import (dir + "/${args.version}.nix"); - bcop = selectVersion ./bcop args; - libcompizconfig = selectVersion ./libcompizconfig (args // {inherit bcop;}); - configBackendGConf = selectVersion ./config-backend (args // {inherit bcop libcompizconfig;}); - compizConfigPython = selectVersion ./compizconfig-python (args // {inherit libcompizconfig - bcop pyrex configBackendGConf;}); - ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); - pluginsMain = selectVersion ./main (args //{inherit bcop ;}); - pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;}); - compizManager = (import ./compiz-manager/0.6.0.nix) (args // {inherit bcop ccsm;}); - ccsmSimple = selectVersion ./ccsm-simple (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); -} diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix deleted file mode 100644 index 7ea173e15611..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix +++ /dev/null @@ -1,32 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2; - sha256 ="0hdnabq1bxln5cf6k9532iszj5qbhwkyl3b5d1gwfr80i01qxzy9"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop libjpeg gettext pluginsMain]; - configureFlags = []; - } ; - in with localDefs; -let - sharePlugins = fullDepEntry (" - ensureDir \$out/share/compiz-plugins - ln -vsf \$out/lib/compiz \$out/share/compiz-plugins - ") [minInit doMakeInstall defEnsureDir]; - fixIncludes = fullDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz" - '') [minInit doUnpack]; -in -stdenv.mkDerivation rec { - name = "compiz-fusion-plugins-extra-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]); - meta = { - description = " - Extra Compiz Fusion plugins. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix b/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix deleted file mode 100644 index f83ae7d1c8bf..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix +++ /dev/null @@ -1,10 +0,0 @@ -/* Ubuntu dependencies -build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamage-dev libxinerama-dev libstartup-notification0-dev libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libmetacity-dev librsvg2-dev libdbus-1-dev libdbus-glib-1-dev libgnome-desktop-dev libgnome-window-settings-dev gitweb curl autoconf automake automake1.9 libtool intltool libxslt1-dev xsltproc libwnck-dev -*/ -args: with args; -[ - libpng - GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake - libtool libxslt libwnck intltool perl perlXMLParser compiz pkgconfig libxml2 - gettext -] diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix deleted file mode 100644 index 0ea38bd45202..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix +++ /dev/null @@ -1,23 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2; - sha256 ="1026icgzyjxnn68gbkd85n9p8pxlwbc3h0dqqvpqmr93q1nhdmjr"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop]; - configureFlags = []; - } ; - in with localDefs; -stdenv.mkDerivation rec { - name = "libcompizconfig-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doIntltool doAutotools doConfigure doMakeInstall doForceShare]); - meta = { - description = " - Compiz configuration backend library. -"; - inherit src; - }; -} diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix deleted file mode 100644 index fd4bb896c0ce..000000000000 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2; - sha256 ="0lrvqi8kc8m6yap8pqbdg0wksckd3v3rp3k48q82pyvcwhaaf817"; - }; - buildInputs = (import ../general-dependencies.nix args)++ - [bcop libjpeg gettext]; - configureFlags = []; - } ; - in with localDefs; -let - sharePlugins = fullDepEntry (" - ensureDir \$out/share/compiz-plugins - ln -vsf \$out/lib/compiz \$out/share/compiz-plugins - ") [minInit doMakeInstall defEnsureDir]; -in -stdenv.mkDerivation rec { - name = "compiz-fusion-plugins-main-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]); - meta = { - description = " - Main Compiz Fusion plugins. -"; - inherit src; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6480db8d95e8..d6fd98b66d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5360,46 +5360,6 @@ let compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { }; - /* - compizBase = (builderDefsPackage (import ../applications/window-managers/compiz/0.8.0.nix)) { - inherit lib stringsWithDeps builderDefs; - inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext - intltool binutils; - inherit (xorg) libXcomposite libXfixes libXdamage libXrandr - libXinerama libICE libSM libXrender xextproto compositeproto fixesproto - damageproto randrproto xineramaproto renderproto kbproto xproto libX11 - libxcb; - inherit (gnome) startupnotification libwnck GConf; - inherit (gtkLibs) gtk; - inherit (gnome) libgnome libgnomeui metacity - glib pango libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeprint - libgnomeprintui gnomepanel; - gnomegtk = gnome.gtk; - inherit librsvg fuse; - inherit dbus dbus_glib; - }; - - compiz = compizBase.passthru.function (x : x // { - extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; - }); - - compizFusion = callPackage ../applications/window-managers/compiz-fusion { - version = getConfig ["compizFusion" "version"] "0.7.8"; - inherit (gnome) startupnotification libwnck GConf; - inherit (gnome) libgnome libgnomeui metacity - glib pango libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeprint - libgnomeprintui gnomepanel gnomedesktop; - inherit pyrex; - gnomegtk = gnome.gtk; - }; - - compizExtra = callPackage ../applications/window-managers/compiz/extra.nix { - inherit (gnome) GConf; - }; - */ - cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk11; };