···

       
248
       
248
       
 
       
  targetPkgs = pkgs: (with pkgs;

     

       
249
       
249
       
 
       
    [ udev

     

       
250
       
250
       
 
       
      alsaLib

     

       
251
       
251
       
-
       
    ]) ++ (with pkgs.xlibs;

     

       
251
       
251
       
+
       
    ]) ++ (with pkgs.xorg;

     

       
252
       
252
       
 
       
    [ libX11

     

       
253
       
253
       
 
       
      libXcursor

     

       
254
       
254
       
 
       
      libXrandr

     

···

       
106
       
106
       
 
       
    systemd.services.display-manager.wants = [ "systemd-machined.service" ];

     

       
107
       
107
       
 
       
    systemd.services.display-manager.after = [ "systemd-machined.service" ];

     

       
108
       
108
       
 
       


     

       
109
       
109
       
-
       
    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ];

     

       
109
       
109
       
+
       
    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ];

     

       
110
       
110
       
 
       


     

       
111
       
111
       
 
       
    services.dbus.packages = [ gdm ];

     

       
112
       
112
       
 
       


     

···

       
19
       
19
       
 
       
      ''}

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
      [X-*-Core]

     

       
22
       
22
       
-
       
      Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb

     

       
22
       
22
       
+
       
      Xrdb=${pkgs.xorg.xrdb}/bin/xrdb

     

       
23
       
23
       
 
       
      SessionsDirs=${dmcfg.session.desktops}

     

       
24
       
24
       
 
       
      Session=${dmcfg.session.script}

     

       
25
       
25
       
 
       
      FailsafeClient=${pkgs.xterm}/bin/xterm

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs

     

       
2
       
2
       
-
       
, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg

     

       
2
       
2
       
+
       
, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg

     

       
3
       
3
       
 
       
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper

     

       
4
       
4
       
 
       
, mpg123, neon, faad2

     

       
5
       
5
       
 
       
}:

     
···

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  buildInputs =

     

       
23
       
23
       
 
       
    [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib

     

       
24
       
24
       
-
       
      libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio

     

       
24
       
24
       
+
       
      libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio

     

       
25
       
25
       
 
       
      libcddb ffmpeg makeWrapper mpg123 neon faad2

     

       
26
       
26
       
 
       
    ];

     

       
27
       
27
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation  rec {

     

       
4
       
4
       
 
       
  name = "bristol-${version}";

     
···

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  buildInputs = [

     

       
13
       
13
       
-
       
    alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext

     

       
14
       
14
       
-
       
    xlibs.xproto

     

       
13
       
13
       
+
       
    alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext

     

       
14
       
14
       
+
       
    xorg.xproto

     

       
15
       
15
       
 
       
  ];

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  preInstall = ''

     

···

       
1
       
1
       
 
       
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2

     

       
2
       
2
       
-
       
, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }:

     

       
2
       
2
       
+
       
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  name = "distrho-ports-git-2015-07-18";

     
···

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  buildInputs = [

     

       
18
       
18
       
 
       
    alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3

     

       
19
       
19
       
-
       
    xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext

     

       
20
       
20
       
-
       
    xlibs.libXinerama xlibs.libXrender ladspa-sdk

     

       
19
       
19
       
+
       
    xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext

     

       
20
       
20
       
+
       
    xorg.libXinerama xorg.libXrender ladspa-sdk

     

       
21
       
21
       
 
       
  ];

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  buildPhase = ''

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:

     

       
2
       
2
       
 
       
stdenv.mkDerivation rec {

     

       
3
       
3
       
 
       
  name = "eq10q-2-${version}";

     

       
4
       
4
       
 
       
  version = "beta7.1";

     
···

       
7
       
7
       
 
       
    sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";

     

       
8
       
8
       
 
       
  };

     

       
9
       
9
       
 
       


     

       
10
       
10
       
-
       
  buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ];

     

       
10
       
10
       
+
       
  buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  installFlags = ''

     

       
13
       
13
       
 
       
    DESTDIR=$(out)

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  name = "jaaa-${version}";

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper

     

       
2
       
2
       
 
       
# transports

     

       
3
       
3
       
 
       
, curl, libmms

     

       
4
       
4
       
 
       
# input plugins

     
···

       
37
       
37
       
 
       


     

       
38
       
38
       
 
       
  buildInputs =

     

       
39
       
39
       
 
       
    [ # basic requirements

     

       
40
       
40
       
-
       
      cmake qt4 pkgconfig x11

     

       
40
       
40
       
+
       
      cmake qt4 pkgconfig xlibsWrapper

     

       
41
       
41
       
 
       
      # transports

     

       
42
       
42
       
 
       
      curl libmms

     

       
43
       
43
       
 
       
      # input plugins

     

···

       
1
       
1
       
 
       
{ stdenv, pkgs, fetchFromGitHub,

     

       
2
       
2
       
-
       
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile

     

       
2
       
2
       
+
       
automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile

     

       
3
       
3
       
 
       
}:

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     
···

       
13
       
13
       
 
       
    sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
-
       
  buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];

     

       
16
       
16
       
+
       
  buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  meta = {

     

       
19
       
19
       
 
       
    description = "Rakarrak effects ported to LV2";

     

···

       
1
       
1
       
-
       
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype

     

       
1
       
1
       
+
       
{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype

     

       
2
       
2
       
 
       
, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf

     

       
3
       
3
       
 
       
, libgcrypt, chromium, udev, fontconfig

     

       
4
       
4
       
 
       
, dbus, expat }:

     
···

       
28
       
28
       
 
       
    qt4

     

       
29
       
29
       
 
       
    stdenv.cc.cc

     

       
30
       
30
       
 
       
    udev

     

       
31
       
31
       
-
       
    xlibs.libX11

     

       
32
       
32
       
-
       
    xlibs.libXcomposite

     

       
33
       
33
       
-
       
    xlibs.libXdamage

     

       
34
       
34
       
-
       
    xlibs.libXext

     

       
35
       
35
       
-
       
    xlibs.libXfixes

     

       
36
       
36
       
-
       
    xlibs.libXi

     

       
37
       
37
       
-
       
    xlibs.libXrandr

     

       
38
       
38
       
-
       
    xlibs.libXrender

     

       
39
       
39
       
-
       
    xlibs.libXrender

     

       
40
       
40
       
-
       
    xlibs.libXScrnSaver

     

       
31
       
31
       
+
       
    xorg.libX11

     

       
32
       
32
       
+
       
    xorg.libXcomposite

     

       
33
       
33
       
+
       
    xorg.libXdamage

     

       
34
       
34
       
+
       
    xorg.libXext

     

       
35
       
35
       
+
       
    xorg.libXfixes

     

       
36
       
36
       
+
       
    xorg.libXi

     

       
37
       
37
       
+
       
    xorg.libXrandr

     

       
38
       
38
       
+
       
    xorg.libXrender

     

       
39
       
39
       
+
       
    xorg.libXrender

     

       
40
       
40
       
+
       
    xorg.libXScrnSaver

     

       
41
       
41
       
 
       
  ];

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
in

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, makeWrapper

     

       
2
       
2
       
 
       
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient

     

       
3
       
3
       
-
       
, libsndfile, libxcb, xlibs

     

       
3
       
3
       
+
       
, libsndfile, libxcb, xorg

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     
···

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  buildInputs = [

     

       
18
       
18
       
 
       
    expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype

     

       
19
       
19
       
-
       
    libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender

     

       
19
       
19
       
+
       
    libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender

     

       
20
       
20
       
 
       
  ];

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  makeFlags = [

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2

     

       
2
       
2
       
-
       
, intltool, x11, libxklavier, libgcrypt, libaudit

     

       
2
       
2
       
+
       
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit

     

       
3
       
3
       
 
       
, qt4 ? null, qt5 ? null

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib

     

       
2
       
2
       
 
       
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf

     

       
3
       
3
       
-
       
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd

     

       
3
       
3
       
+
       
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     
···

       
9
       
9
       
 
       
    paths = [

     

       
10
       
10
       
 
       
      stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3

     

       
11
       
11
       
 
       
      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss

     

       
12
       
12
       
-
       
      xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst

     

       
13
       
13
       
-
       
      xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr

     

       
14
       
14
       
-
       
      xlibs.libXcursor libcap systemd

     

       
12
       
12
       
+
       
      xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst

     

       
13
       
13
       
+
       
      xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

     

       
14
       
14
       
+
       
      xorg.libXcursor libcap systemd

     

       
15
       
15
       
 
       
    ];

     

       
16
       
16
       
 
       
  };

     

       
17
       
17
       
 
       
in stdenv.mkDerivation rec {

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d

     

       
2
       
2
       
 
       
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif

     

       
3
       
3
       
 
       
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls

     

       
4
       
4
       
 
       
, alsaLib, cairo, acl, gpm

     
···

       
43
       
43
       
 
       
    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]

     

       
44
       
44
       
 
       
    ++ stdenv.lib.optional stdenv.isLinux dbus

     

       
45
       
45
       
 
       
    ++ stdenv.lib.optionals withX

     

       
46
       
46
       
-
       
      [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

     

       
46
       
46
       
+
       
      [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

     

       
47
       
47
       
 
       
        imagemagick gconf ]

     

       
48
       
48
       
 
       
    ++ stdenv.lib.optional (withX && withGTK2) gtk2

     

       
49
       
49
       
 
       
    ++ stdenv.lib.optional (withX && withGTK3) gtk3

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib

     

       
2
       
2
       
 
       
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf

     

       
3
       
3
       
-
       
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev

     

       
3
       
3
       
+
       
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     

       
7
       
7
       
 
       
  libPath = stdenv.lib.makeLibraryPath [

     

       
8
       
8
       
 
       
      stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss

     

       
9
       
9
       
 
       
      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf

     

       
10
       
10
       
-
       
      xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst

     

       
11
       
11
       
-
       
      xlibs.libXcomposite xlibs.libXi xlibs.libXfixes

     

       
10
       
10
       
+
       
      xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst

     

       
11
       
11
       
+
       
      xorg.libXcomposite xorg.libXi xorg.libXfixes

     

       
12
       
12
       
 
       
];

     

       
13
       
13
       
 
       
in

     

       
14
       
14
       
 
       
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, x11, motif, libXpm }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
assert stdenv.isLinux;

     

       
4
       
4
       
 
       


     
···

       
10
       
10
       
 
       
    sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";

     

       
11
       
11
       
 
       
  };

     

       
12
       
12
       
 
       


     

       
13
       
13
       
-
       
  buildInputs = [ x11 motif libXpm ];

     

       
13
       
13
       
+
       
  buildInputs = [ xlibsWrapper motif libXpm ];

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  buildFlags = if stdenv.isLinux then "linux" else "";

     

       
16
       
16
       
 
       


     

···

       
1
       
1
       
-
       
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}:

     

       
1
       
1
       
+
       
{ fetchurl, stdenv, glib, xorg, cairo, gtk}:

     

       
2
       
2
       
 
       
let

     

       
3
       
3
       
-
       
  libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo];

     

       
3
       
3
       
+
       
  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];

     

       
4
       
4
       
 
       
in

     

       
5
       
5
       
 
       
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

       
6
       
6
       
 
       


     

···

       
1
       
1
       
-
       
{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }:

     

       
1
       
1
       
+
       
{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       
  build = "3083";

     

       
7
       
7
       
-
       
  libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];

     

       
7
       
7
       
+
       
  libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];

     

       
8
       
8
       
 
       
in let

     

       
9
       
9
       
 
       
  # package with just the binaries

     

       
10
       
10
       
 
       
  sublime = stdenv.mkDerivation {

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl,

     

       
2
       
2
       
 
       
  qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  name = "qgis-2.10.1";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla

     

       
7
       
7
       
+
       
  buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla

     

       
8
       
8
       
 
       
    fcgi libspatialindex libspatialite postgresql ] ++

     

       
9
       
9
       
 
       
    (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];

     

       
10
       
10
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng

     

       
1
       
1
       
+
       
{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng

     

       
2
       
2
       
 
       
, libXinerama, curl, libexif }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     
···

       
9
       
9
       
 
       
    sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
  buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];

     

       
12
       
12
       
+
       
  buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  preBuild = ''

     

       
15
       
15
       
 
       
    makeFlags="PREFIX=$out exif=1"

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf

     

       
2
       
2
       
 
       
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff

     

       
3
       
3
       
 
       
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper

     

       
4
       
4
       
-
       
, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:

     

       
4
       
4
       
+
       
, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
 
       
  name = "gimp-2.8.14";

     
···

       
15
       
15
       
 
       
    [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo

     

       
16
       
16
       
 
       
      freetype fontconfig lcms libpng libjpeg poppler libtiff webkit

     

       
17
       
17
       
 
       
      libmng librsvg libwmf zlib libzip ghostscript aalib jasper

     

       
18
       
18
       
-
       
      python pygtk libart_lgpl libexif gettext xlibs.libXpm

     

       
18
       
18
       
+
       
      python pygtk libart_lgpl libexif gettext xorg.libXpm

     

       
19
       
19
       
 
       
      wrapPython

     

       
20
       
20
       
 
       
    ];

     

       
21
       
21
       
 
       


     
···

       
28
       
28
       
 
       
  #configureFlags = [ "--disable-print" ];

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  # "screenshot" needs this.

     

       
31
       
31
       
-
       
  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"

     

       
31
       
31
       
+
       
  NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"

     

       
32
       
32
       
 
       
    + stdenv.lib.optionalString stdenv.isDarwin " -lintl";

     

       
33
       
33
       
 
       


     

       
34
       
34
       
 
       
  meta = {

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, makeWrapper, imake

     

       
2
       
2
       
-
       
, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:

     

       
2
       
2
       
+
       
, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
let version = "3.2.5b"; in

     

       
5
       
5
       
 
       
stdenv.mkDerivation {

     
···

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  builder = ./builder.sh;

     

       
14
       
14
       
 
       


     

       
15
       
15
       
-
       
  buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];

     

       
15
       
15
       
+
       
  buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  nativeBuildInputs = [ imake makeWrapper ];

     

       
18
       
18
       
 
       


     

···

       
1
       
1
       
-
       
{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }:

     

       
1
       
1
       
+
       
{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  # Inferno is a rolling release from a mercurial repository. For the verison number

     
···

       
22
       
22
       
 
       
  };

     

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
  # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.

     

       
25
       
25
       
-
       
  buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ];

     

       
25
       
25
       
+
       
  buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  infernoWrapper = ./inferno;

     

       
28
       
28
       
 
       


     

···

       
174
       
174
       
 
       
              libvncserver libical networkmanager openal opencv

     

       
175
       
175
       
 
       
              openexr perl phonon pkgconfig polkit_qt4 prison python qca2

     

       
176
       
176
       
 
       
              qimageblitz qjson qt4 samba saneBackends soprano speechd

     

       
177
       
177
       
-
       
              strigi taglib udev xlibs xplanet xscreensaver xz;

     

       
177
       
177
       
+
       
              strigi taglib udev xorg xplanet xscreensaver xz;

     

       
178
       
178
       
 
       
      alsa = alsaLib;

     

       
179
       
179
       
 
       
      assuan = libassuan;

     

       
180
       
180
       
 
       
      boost = boost156;

     
···

       
289
       
289
       
 
       
      kde-wallpapers = kde4Package super.kde-wallpapers;

     

       
290
       
290
       
 
       


     

       
291
       
291
       
 
       
      kde-workspace = extendDerivation (kde4Package super.kde-workspace) {

     

       
292
       
292
       
-
       
        buildInputs = with scope.xlibs; [

     

       
292
       
292
       
+
       
        buildInputs = with scope.xorg; [

     

       
293
       
293
       
 
       
            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil

     

       
294
       
294
       
 
       
        ];

     

       
295
       
295
       
 
       
        nativeBuildInputs = [ scope.pkgconfig ];

     
···

       
385
       
385
       
 
       
      };

     

       
386
       
386
       
 
       


     

       
387
       
387
       
 
       
      kmousetool = extendDerivation (kde4Package super.kmousetool) {

     

       
388
       
388
       
-
       
        buildInputs = with scope.xlibs; [ libXtst libXt ];

     

       
388
       
388
       
+
       
        buildInputs = with scope.xorg; [ libXtst libXt ];

     

       
389
       
389
       
 
       
      };

     

       
390
       
390
       
 
       


     

       
391
       
391
       
 
       
      kmouth = kde4Package super.kmouth;

     
···

       
407
       
407
       
 
       
      krdc = kde4Package super.krdc;

     

       
408
       
408
       
 
       


     

       
409
       
409
       
 
       
      kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {

     

       
410
       
410
       
-
       
        buildInputs = [ scope.xlibs.libXtst ];

     

       
410
       
410
       
+
       
        buildInputs = [ scope.xorg.libXtst ];

     

       
411
       
411
       
 
       
      };

     

       
412
       
412
       
 
       


     

       
413
       
413
       
 
       
      kreversi = kde4Package super.kreversi;

     

       
414
       
414
       
 
       


     

       
415
       
415
       
 
       
      krfb = extendDerivation (kde4Package super.krfb) {

     

       
416
       
416
       
-
       
        buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ];

     

       
416
       
416
       
+
       
        buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];

     

       
417
       
417
       
 
       
      };

     

       
418
       
418
       
 
       


     

       
419
       
419
       
 
       
      ksaneplugin = kde4Package super.ksaneplugin;

     

···

       
1
       
1
       
 
       
{ stdenv, fetchgit, makeWrapper, pkgconfig,

     

       
2
       
2
       
-
       
  gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs,

     

       
2
       
2
       
+
       
  gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,

     

       
3
       
3
       
 
       
  configH

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     
···

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  buildInputs = [

     

       
17
       
17
       
-
       
    gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11

     

       
18
       
18
       
-
       
    xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig

     

       
17
       
17
       
+
       
    gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11

     

       
18
       
18
       
+
       
    xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig

     

       
19
       
19
       
 
       
  ];

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  buildPhase = ''

     

···

       
1
       
1
       
 
       
{ stdenv, lib, fetchgit, makeWrapper

     

       
2
       
2
       
 
       
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc

     

       
3
       
3
       
 
       
, keybinder3, clutter_gtk, libnotify

     

       
4
       
4
       
-
       
, libxkbcommon, xlibs, udev

     

       
4
       
4
       
+
       
, libxkbcommon, xorg, udev

     

       
5
       
5
       
 
       
, bashInteractive

     

       
6
       
6
       
 
       
}:

     

       
7
       
7
       
 
       


     
···

       
17
       
17
       
 
       
  buildInputs = [

     

       
18
       
18
       
 
       
    pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee

     

       
19
       
19
       
 
       
    gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper

     

       
20
       
20
       
-
       
    xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence

     

       
20
       
20
       
+
       
    xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence

     

       
21
       
21
       
 
       
    libxkbcommon

     

       
22
       
22
       
 
       
  ] ++ lib.optionals stdenv.isLinux [

     

       
23
       
23
       
 
       
    udev

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation {

     

       
4
       
4
       
 
       
  name = "keepassx2-2.0beta2";

     
···

       
7
       
7
       
 
       
    sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";

     

       
8
       
8
       
 
       
  };

     

       
9
       
9
       
 
       


     

       
10
       
10
       
-
       
  buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];

     

       
10
       
10
       
+
       
  buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  meta = {

     

       
13
       
13
       
 
       
    description = "Qt password manager compatible with its Win32 and Pocket PC versions";

     

···

       
1
       
1
       
-
       
{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr

     

       
1
       
1
       
+
       
{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr

     

       
2
       
2
       
 
       
, xinput, curl, openssl, unzip }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
with stdenv.lib;

     
···

       
37
       
37
       
 
       
  '';

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  buildInputs = [

     

       
40
       
40
       
-
       
    cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl

     

       
40
       
40
       
+
       
    cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl

     

       
41
       
41
       
 
       
  ];

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
  installPhase = ''

     

···

       
1
       
1
       
-
       
{stdenv, fetchurl, tcl, tk, x11, makeWrapper}:

     

       
1
       
1
       
+
       
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let version = "3.0"; in

     

       
4
       
4
       
 
       
stdenv.mkDerivation {

     
···

       
8
       
8
       
 
       
    sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";

     

       
9
       
9
       
 
       
  };

     

       
10
       
10
       
 
       


     

       
11
       
11
       
-
       
  buildInputs = [tcl tk x11 makeWrapper];

     

       
11
       
11
       
+
       
  buildInputs = [tcl tk xlibsWrapper makeWrapper];

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  patchPhase = ''

     

       
14
       
14
       
 
       
    sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, gccmakedep, xlibs }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, gccmakedep, xorg }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation {

     

       
4
       
4
       
 
       
  name = "xcruiser-0.30";

     
···

       
8
       
8
       
 
       
      sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";

     

       
9
       
9
       
 
       
    };

     

       
10
       
10
       
 
       


     

       
11
       
11
       
-
       
  buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ];

     

       
11
       
11
       
+
       
  buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  configurePhase = "xmkmf -a";

     

       
14
       
14
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  name = "xfe-1.37";

     
···

       
8
       
8
       
 
       
    sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";

     

       
9
       
9
       
 
       
  };

     

       
10
       
10
       
 
       


     

       
11
       
11
       
-
       
  buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];

     

       
11
       
11
       
+
       
  buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  preConfigure = ''

     

       
14
       
14
       
 
       
    sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

     

···

       
1
       
1
       
 
       
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false

     

       
2
       
2
       
-
       
, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null

     

       
2
       
2
       
+
       
, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null

     

       
3
       
3
       
 
       
, base14Fonts ? null

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
assert enableGUI -> x11 != null && motif != null && freetype != null;

     

       
6
       
6
       
+
       
assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;

     

       
7
       
7
       
 
       
assert enablePDFtoPPM -> freetype != null;

     

       
8
       
8
       
 
       
assert useT1Lib -> t1lib != null;

     

       
9
       
9
       
 
       


     
···

       
18
       
18
       
 
       
  };

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  buildInputs = [ zlib libpng ] ++

     

       
21
       
21
       
-
       
    stdenv.lib.optionals enableGUI [x11 motif] ++

     

       
21
       
21
       
+
       
    stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++

     

       
22
       
22
       
 
       
    stdenv.lib.optional useT1Lib t1lib ++

     

       
23
       
23
       
 
       
    stdenv.lib.optional enablePDFtoPPM freetype;

     

       
24
       
24
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl

     

       
2
       
2
       
 
       
, spidermonkey, gpm

     

       
3
       
3
       
 
       
, enableGuile ? false, guile ? null   # Incompatible licenses, LGPLv3 - GPLv2

     

       
4
       
4
       
 
       
, enablePython ? false, python ? null

     
···

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  patches = [ ./gc-init.patch ];

     

       
19
       
19
       
 
       


     

       
20
       
20
       
-
       
  buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]

     

       
20
       
20
       
+
       
  buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]

     

       
21
       
21
       
 
       
    ++ stdenv.lib.optional enableGuile guile

     

       
22
       
22
       
 
       
    ++ stdenv.lib.optional enablePython python;

     

       
23
       
23
       
 
       


     

···

       
1
       
1
       
 
       
{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL

     

       
2
       
2
       
-
       
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs

     

       
2
       
2
       
+
       
, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg

     

       
3
       
3
       
 
       
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify

     

       
4
       
4
       
 
       
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite

     

       
5
       
5
       
 
       
, hunspell, libevent, libstartup_notification, libvpx

     
···

       
41
       
41
       
 
       


     

       
42
       
42
       
 
       
  buildInputs =

     

       
43
       
43
       
 
       
    [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2

     

       
44
       
44
       
-
       
      python dbus dbus_glib pango freetype fontconfig xlibs.libXi

     

       
45
       
45
       
-
       
      xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file

     

       
46
       
46
       
-
       
      alsaLib nspr nss libnotify xlibs.pixman yasm mesa

     

       
47
       
47
       
-
       
      xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite

     

       
48
       
48
       
-
       
      xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper

     

       
44
       
44
       
+
       
      python dbus dbus_glib pango freetype fontconfig xorg.libXi

     

       
45
       
45
       
+
       
      xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file

     

       
46
       
46
       
+
       
      alsaLib nspr nss libnotify xorg.pixman yasm mesa

     

       
47
       
47
       
+
       
      xorg.libXScrnSaver xorg.scrnsaverproto pysqlite

     

       
48
       
48
       
+
       
      xorg.libXext xorg.xextproto sqlite unzip makeWrapper

     

       
49
       
49
       
 
       
      hunspell libevent libstartup_notification libvpx /* cairo */

     

       
50
       
50
       
 
       
      gstreamer gst_plugins_base icu libpng jemalloc

     

       
51
       
51
       
 
       
      libpulseaudio # only headers are needed

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper

     

       
2
       
2
       
 
       
, GConf, gnome_mplayer, mplayer, gmtk

     

       
3
       
3
       
 
       
}:

     

       
4
       
4
       
 
       


     
···

       
10
       
10
       
 
       
    sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";

     

       
11
       
11
       
 
       
  };

     

       
12
       
12
       
 
       


     

       
13
       
13
       
-
       
  buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ];

     

       
13
       
13
       
+
       
  buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ];

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  # !!! fix this

     

       
16
       
16
       
 
       
  preBuild =

     

···

       
3
       
3
       
 
       
, graphicsSupport ? false

     

       
4
       
4
       
 
       
, mouseSupport ? false

     

       
5
       
5
       
 
       
, ncurses, openssl ? null, boehmgc, gettext, zlib

     

       
6
       
6
       
-
       
, imlib2 ? null, x11 ? null, fbcon ? null

     

       
6
       
6
       
+
       
, imlib2 ? null, xlibsWrapper ? null, fbcon ? null

     

       
7
       
7
       
 
       
, gpm-ncurses ? null

     

       
8
       
8
       
 
       
}:

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
assert sslSupport -> openssl != null;

     

       
11
       
11
       
-
       
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);

     

       
11
       
11
       
+
       
assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null);

     

       
12
       
12
       
 
       
assert mouseSupport -> gpm-ncurses != null;

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
stdenv.mkDerivation rec {

     
···

       
28
       
28
       
 
       
  buildInputs = [ncurses boehmgc gettext zlib]

     

       
29
       
29
       
 
       
    ++ stdenv.lib.optional sslSupport openssl

     

       
30
       
30
       
 
       
    ++ stdenv.lib.optional mouseSupport gpm-ncurses

     

       
31
       
31
       
-
       
    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];

     

       
31
       
31
       
+
       
    ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon];

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"

     

       
34
       
34
       
 
       
    + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";

     

···

       
1
       
1
       
-
       
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:

     

       
1
       
1
       
+
       
{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation {

     

       
4
       
4
       
 
       
  name = "amsn-0.98.9";

     
···

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
  buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];

     

       
12
       
12
       
+
       
  buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  postInstall = ''

     

       
15
       
15
       
 
       
    wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib

     

       
2
       
2
       
 
       
, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid

     

       
3
       
3
       
 
       
, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra

     

       
4
       
4
       
 
       
, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }:

     
···

       
10
       
10
       
 
       
  rpath = stdenv.lib.makeSearchPath "lib" [

     

       
11
       
11
       
 
       
    stdenv.glibc

     

       
12
       
12
       
 
       
    libtool

     

       
13
       
13
       
-
       
    xlibs.libXext

     

       
14
       
14
       
-
       
    xlibs.libSM

     

       
15
       
15
       
-
       
    xlibs.libICE

     

       
16
       
16
       
-
       
    xlibs.libX11

     

       
17
       
17
       
-
       
    xlibs.libXft

     

       
18
       
18
       
-
       
    xlibs.libXau

     

       
19
       
19
       
-
       
    xlibs.libXdmcp

     

       
20
       
20
       
-
       
    xlibs.libXrender

     

       
21
       
21
       
-
       
    xlibs.libXfixes

     

       
22
       
22
       
-
       
    xlibs.libXcomposite

     

       
23
       
23
       
-
       
    xlibs.libxcb

     

       
24
       
24
       
-
       
    xlibs.libXi

     

       
13
       
13
       
+
       
    xorg.libXext

     

       
14
       
14
       
+
       
    xorg.libSM

     

       
15
       
15
       
+
       
    xorg.libICE

     

       
16
       
16
       
+
       
    xorg.libX11

     

       
17
       
17
       
+
       
    xorg.libXft

     

       
18
       
18
       
+
       
    xorg.libXau

     

       
19
       
19
       
+
       
    xorg.libXdmcp

     

       
20
       
20
       
+
       
    xorg.libXrender

     

       
21
       
21
       
+
       
    xorg.libXfixes

     

       
22
       
22
       
+
       
    xorg.libXcomposite

     

       
23
       
23
       
+
       
    xorg.libxcb

     

       
24
       
24
       
+
       
    xorg.libXi

     

       
25
       
25
       
 
       
    freetype

     

       
26
       
26
       
 
       
    fontconfig

     

       
27
       
27
       
 
       
    openssl

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype

     

       
2
       
2
       
-
       
, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null

     

       
2
       
2
       
+
       
, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null

     

       
3
       
3
       
 
       
, libredirect, quazip, less, which, unzip

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     
···

       
12
       
12
       
 
       
  deps =

     

       
13
       
13
       
 
       
    [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender

     

       
14
       
14
       
 
       
      xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama

     

       
15
       
15
       
-
       
      xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio

     

       
15
       
15
       
+
       
      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio

     

       
16
       
16
       
 
       
    ];

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  desktopItem = makeDesktopItem {

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg

     

       
2
       
2
       
-
       
, bwidget, makeWrapper, x11

     

       
2
       
2
       
+
       
, bwidget, makeWrapper, xlibsWrapper

     

       
3
       
3
       
 
       
, withSitePlugins ? true

     

       
4
       
4
       
 
       
, theme ? null

     

       
5
       
5
       
 
       
}:

     
···

       
62
       
62
       
 
       
    done

     

       
63
       
63
       
 
       
  '';

     

       
64
       
64
       
 
       


     

       
65
       
65
       
-
       
  buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;

     

       
65
       
65
       
+
       
  buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;

     

       
66
       
66
       
 
       


     

       
67
       
67
       
 
       
  meta = {

     

       
68
       
68
       
 
       
    homepage = "http://tkabber.jabber.ru/";

     

···

       
1
       
1
       
-
       
{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }:

     

       
1
       
1
       
+
       
{ fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
assert stdenv.system == "x86_64-linux";

     

       
4
       
4
       
 
       


     
···

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
  libPath = stdenv.lib.makeLibraryPath [

     

       
25
       
25
       
 
       
      qt5Full

     

       
26
       
26
       
-
       
      xlibs.libX11

     

       
26
       
26
       
+
       
      xorg.libX11

     

       
27
       
27
       
 
       
      gstreamer

     

       
28
       
28
       
 
       
      zlib

     

       
29
       
29
       
 
       
      sqlite

     

       
30
       
30
       
-
       
      xlibs.libXrender

     

       
30
       
30
       
+
       
      xorg.libXrender

     

       
31
       
31
       
 
       
      libxslt

     

       
32
       
32
       
 
       
      stdenv.cc.cc

     

       
33
       
33
       
-
       
      xlibs.libXScrnSaver

     

       
34
       
34
       
-
       
      xlibs.libXext

     

       
33
       
33
       
+
       
      xorg.libXScrnSaver

     

       
34
       
34
       
+
       
      xorg.libXext

     

       
35
       
35
       
 
       
  ];

     

       
36
       
36
       
 
       


     

       
37
       
37
       
 
       
  installPhase = ''

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL

     

       
2
       
2
       
-
       
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs

     

       
2
       
2
       
+
       
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg

     

       
3
       
3
       
 
       
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify

     

       
4
       
4
       
 
       
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite

     

       
5
       
5
       
 
       
, hunspell, libevent, libstartup_notification, libvpx

     
···

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       
  buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx

     

       
30
       
30
       
 
       
    [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2

     

       
31
       
31
       
-
       
      python dbus dbus_glib pango freetype fontconfig xlibs.libXi

     

       
32
       
32
       
-
       
      xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file

     

       
33
       
33
       
-
       
      alsaLib nspr nss libnotify xlibs.pixman yasm mesa

     

       
34
       
34
       
-
       
      xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite

     

       
35
       
35
       
-
       
      xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper

     

       
31
       
31
       
+
       
      python dbus dbus_glib pango freetype fontconfig xorg.libXi

     

       
32
       
32
       
+
       
      xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file

     

       
33
       
33
       
+
       
      alsaLib nspr nss libnotify xorg.pixman yasm mesa

     

       
34
       
34
       
+
       
      xorg.libXScrnSaver xorg.scrnsaverproto pysqlite

     

       
35
       
35
       
+
       
      xorg.libXext xorg.xextproto sqlite unzip makeWrapper

     

       
36
       
36
       
 
       
      hunspell libevent libstartup_notification cairo icu

     

       
37
       
37
       
 
       
    ] ++ [ m4 ];

     

       
38
       
38
       
 
       


     

···

       
1
       
1
       
 
       
{ fetchurl, stdenv, dpkg, makeWrapper, which

     

       
2
       
2
       
-
       
,gcc, xlibs, qt4, zlib

     

       
2
       
2
       
+
       
,gcc, xorg, qt4, zlib

     

       
3
       
3
       
 
       
, ...}:

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

     
···

       
24
       
24
       
 
       
  deps = [

     

       
25
       
25
       
 
       
    gcc.cc

     

       
26
       
26
       
 
       
    qt4

     

       
27
       
27
       
-
       
    xlibs.libX11

     

       
27
       
27
       
+
       
    xorg.libX11

     

       
28
       
28
       
 
       
    zlib

     

       
29
       
29
       
 
       
  ];

     

       
30
       
30
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       


     

···

       
12
       
12
       
 
       
, opencv

     

       
13
       
13
       
 
       
, openssl

     

       
14
       
14
       
 
       
, unixODBC

     

       
15
       
15
       
-
       
, xlibs

     

       
15
       
15
       
+
       
, xorg

     

       
16
       
16
       
 
       
, zlib

     

       
17
       
17
       
 
       
}:

     

       
18
       
18
       
 
       


     
···

       
51
       
51
       
 
       
    opencv

     

       
52
       
52
       
 
       
    openssl

     

       
53
       
53
       
 
       
    unixODBC

     

       
54
       
54
       
-
       
  ] ++ (with xlibs; [

     

       
54
       
54
       
+
       
  ] ++ (with xorg; [

     

       
55
       
55
       
 
       
    libX11

     

       
56
       
56
       
 
       
    libXext

     

       
57
       
57
       
 
       
    libXtst

     

···

       
12
       
12
       
 
       
, opencv

     

       
13
       
13
       
 
       
, openssl

     

       
14
       
14
       
 
       
, unixODBC

     

       
15
       
15
       
-
       
, xlibs

     

       
15
       
15
       
+
       
, xorg

     

       
16
       
16
       
 
       
, zlib

     

       
17
       
17
       
 
       
, libxml2

     

       
18
       
18
       
 
       
, libuuid

     
···

       
56
       
56
       
 
       
    unixODBC

     

       
57
       
57
       
 
       
    libxml2

     

       
58
       
58
       
 
       
    libuuid

     

       
59
       
59
       
-
       
  ] ++ (with xlibs; [

     

       
59
       
59
       
+
       
  ] ++ (with xorg; [

     

       
60
       
60
       
 
       
    libX11

     

       
61
       
61
       
 
       
    libXext

     

       
62
       
62
       
 
       
    libXtst

     

···

       
8
       
8
       
 
       
, ocaml, withOCaml ? false

     

       
9
       
9
       
 
       
#, withJava ? false

     

       
10
       
10
       
 
       
#, atlasMath, withAtlas ? false

     

       
11
       
11
       
-
       
, x11, withX ? false

     

       
11
       
11
       
+
       
, xlibsWrapper, withX ? false

     

       
12
       
12
       
 
       
}:

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
stdenv.mkDerivation rec {

     
···

       
23
       
23
       
 
       
  buildInputs = [gfortran ncurses]

     

       
24
       
24
       
 
       
  ++ lib.optionals withGtk [gtk]

     

       
25
       
25
       
 
       
  ++ lib.optionals withOCaml [ocaml]

     

       
26
       
26
       
-
       
  ++ lib.optionals withX [x11]

     

       
26
       
26
       
+
       
  ++ lib.optional withX xlibsWrapper

     

       
27
       
27
       
 
       
  ;

     

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       


     
···

       
58
       
58
       
 
       
  # do not compile Java interface

     

       
59
       
59
       
 
       
  + " --without-java"

     

       
60
       
60
       
 
       
  # use the X Window System

     

       
61
       
61
       
-
       
  + (lib.optionalString withX "

     

       
62
       
62
       
-
       
      --with-x

     

       
63
       
63
       
-
       
      --x-libraries=${x11}/lib

     

       
64
       
64
       
-
       
      --x-includes=${x11}/include

     

       
65
       
65
       
-
       
    ")

     

       
61
       
61
       
+
       
  + lib.optionalString withX "--with-x"

     

       
66
       
62
       
 
       
  ;

     

       
67
       
63
       
 
       


     

       
68
       
64
       
 
       
  makeFlags = "all";

     

···

       
1
       
1
       
 
       
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,

     

       
2
       
2
       
 
       
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,

     

       
3
       
3
       
 
       
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,

     

       
4
       
4
       
-
       
doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }:

     

       
4
       
4
       
+
       
doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     

       
7
       
7
       
 
       


     
···

       
17
       
17
       
 
       
  buildInputs = [autoconf cmake automake libtool gfortran clang gnumake

     

       
18
       
18
       
 
       
    hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which

     

       
19
       
19
       
 
       
    lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison

     

       
20
       
20
       
-
       
    doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu

     

       
20
       
20
       
+
       
    doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu

     

       
21
       
21
       
 
       
    git gtk makeWrapper];

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  patchPhase = ''

     

···

       
51
       
51
       
 
       


     

       
52
       
52
       
 
       
  qgit = import ./qgit {

     

       
53
       
53
       
 
       
    inherit fetchurl stdenv;

     

       
54
       
54
       
-
       
    inherit (xlibs) libXext libX11;

     

       
54
       
54
       
+
       
    inherit (xorg) libXext libX11;

     

       
55
       
55
       
 
       
    qt = qt4;

     

       
56
       
56
       
 
       
  };

     

       
57
       
57
       
 
       


     

       
58
       
58
       
 
       
  qgitGit = import ./qgit/qgit-git.nix {

     

       
59
       
59
       
 
       
    inherit fetchurl sourceFromHead stdenv;

     

       
60
       
60
       
-
       
    inherit (xlibs) libXext libX11;

     

       
60
       
60
       
+
       
    inherit (xorg) libXext libX11;

     

       
61
       
61
       
 
       
    qt = qt4;

     

       
62
       
62
       
 
       
  };

     

       
63
       
63
       
 
       


     

···

       
3
       
3
       
 
       
, gst_ffmpeg, speex

     

       
4
       
4
       
 
       
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool

     

       
5
       
5
       
 
       
, boost, freetype, agg, dbus, curl, pkgconfig, gettext

     

       
6
       
6
       
-
       
, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl

     

       
6
       
6
       
+
       
, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl

     

       
7
       
7
       
 
       
, freefont_ttf, haxe, swftools

     

       
8
       
8
       
 
       
, lib, makeWrapper

     

       
9
       
9
       
 
       
, xulrunner }:

     
···

       
51
       
51
       
 
       


     

       
52
       
52
       
 
       
  # XXX: KDE is supported as well so we could make it available optionally.

     

       
53
       
53
       
 
       
  buildInputs = [

     

       
54
       
54
       
-
       
    gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good

     

       
54
       
54
       
+
       
    gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good

     

       
55
       
55
       
 
       
    gst_ffmpeg speex libtool

     

       
56
       
56
       
 
       
    libogg libxml2 libjpeg mesa libpng libungif boost freetype agg

     

       
57
       
57
       
 
       
    dbus curl pkgconfig glib gtk gtkglext pangox_compat

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec

     

       
2
       
2
       
 
       
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig

     

       
3
       
3
       
 
       
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu

     

       
4
       
4
       
 
       
, yasm, libuuid, taglib, libtool, autoconf, automake, file

     
···

       
16
       
16
       
 
       
  sourceRoot = "${name}/mythtv";

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  buildInputs = [

     

       
19
       
19
       
-
       
    freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec

     

       
19
       
19
       
+
       
    freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec

     

       
20
       
20
       
 
       
    libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu

     

       
21
       
21
       
 
       
    libuuid taglib

     

       
22
       
22
       
 
       
  ];

     

···

       
1
       
1
       
-
       
{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, 

     

       
1
       
1
       
+
       
{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, 

     

       
2
       
2
       
 
       
   libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, 

     

       
3
       
3
       
 
       
   pkgconfig, kernel, file, libXi}:

     

       
4
       
4
       
 
       


     
···

       
48
       
48
       
 
       
  '';

     

       
49
       
49
       
 
       


     

       
50
       
50
       
 
       
  configureFlags = '' 

     

       
51
       
51
       
-
       
    --x-includes=${xlibs.libX11}/include 

     

       
52
       
52
       
-
       
    --x-libraries=${xlibs.libX11}/lib

     

       
51
       
51
       
+
       
    --x-includes=${xorg.libX11}/include 

     

       
52
       
52
       
+
       
    --x-libraries=${xorg.libX11}/lib

     

       
53
       
53
       
 
       
  '';

     

       
54
       
54
       
 
       


     

       
55
       
55
       
 
       
  buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray

     

       
2
       
2
       
 
       
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib

     

       
3
       
3
       
 
       
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska

     

       
4
       
4
       
 
       
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp

     
···

       
32
       
32
       
 
       
      libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec

     

       
33
       
33
       
 
       
      udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib

     

       
34
       
34
       
 
       
      libkate libtiger libv4l samba liboggz libass libdvbpsi libva

     

       
35
       
35
       
-
       
      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms

     

       
35
       
35
       
+
       
      xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms

     

       
36
       
36
       
 
       
      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate

     

       
37
       
37
       
 
       
    ]

     

       
38
       
38
       
 
       
    ++ (if withQt5 then with qt5; [ base ] else [qt4])

     

···

       
1
       
1
       
-
       
{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl

     

       
1
       
1
       
+
       
{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl

     

       
2
       
2
       
 
       
, lirc, shared_mime_info, libjpeg }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     
···

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  buildInputs =

     

       
15
       
15
       
 
       
    [ xineLib libpng readline ncurses curl lirc libjpeg

     

       
16
       
16
       
-
       
      xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto

     

       
17
       
17
       
-
       
      xlibs.libXinerama xlibs.libXi xlibs.libXft

     

       
16
       
16
       
+
       
      xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto

     

       
17
       
17
       
+
       
      xorg.libXinerama xorg.libXi xorg.libXft

     

       
18
       
18
       
 
       
    ];

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';

     

···

       
1
       
1
       
 
       
{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,

     

       
2
       
2
       
 
       
  libmspack, openssl, pam, xercesc, icu, libdnet, procps, 

     

       
3
       
3
       
-
       
  x11, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       
3
       
3
       
+
       
  xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,

     

       
4
       
4
       
 
       
  pkgconfig, glib, gtk, gtkmm }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     
···

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  buildInputs = 

     

       
20
       
20
       
 
       
    [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps

     

       
21
       
21
       
-
       
      pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ];

     

       
21
       
21
       
+
       
      pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  patchPhase = ''

     

       
24
       
24
       
 
       
     sed -i s,-Werror,,g configure.ac

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl

     

       
2
       
2
       
 
       
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2

     

       
3
       
3
       
 
       
, lvm2, utillinux, procps, texinfo, perl, pythonPackages

     

       
4
       
4
       
-
       
, glib, bridge-utils, xlibs, pixman, iproute, udev, bison

     

       
4
       
4
       
+
       
, glib, bridge-utils, xorg, pixman, iproute, udev, bison

     

       
5
       
5
       
 
       
, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl

     

       
6
       
6
       
 
       
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice

     

       
7
       
7
       
 
       
, spice_protocol, usbredir, alsaLib, quilt

     
···

       
66
       
66
       
 
       
    [ which zlib pkgconfig SDL openssl libuuid gettext ncurses

     

       
67
       
67
       
 
       
      dev86 iasl pciutils bzip2 xz texinfo perl yajl

     

       
68
       
68
       
 
       
      pythonPackages.python pythonPackages.wrapPython

     

       
69
       
69
       
-
       
      glib bridge-utils pixman iproute udev bison xlibs.libX11

     

       
69
       
69
       
+
       
      glib bridge-utils pixman iproute udev bison xorg.libX11

     

       
70
       
70
       
 
       
      flex ocaml ocamlPackages.findlib figlet libaio

     

       
71
       
71
       
 
       
      checkpolicy pythonPackages.markdown transfig

     

       
72
       
72
       
 
       
      glusterfs acl cmake spice spice_protocol usbredir

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf

     

       
2
       
2
       
-
       
, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs

     

       
2
       
2
       
+
       
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs

     

       
3
       
3
       
 
       
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter

     

       
4
       
4
       
 
       
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm

     

       
5
       
5
       
 
       
, which, dbus, nettools, git, asciidoc, doxygen

     
···

       
46
       
46
       
 
       
    pango

     

       
47
       
47
       
 
       
    pkgconfig

     

       
48
       
48
       
 
       
    xcb-util-cursor

     

       
49
       
49
       
-
       
    xlibs.libXau

     

       
50
       
50
       
-
       
    xlibs.libXdmcp

     

       
51
       
51
       
-
       
    xlibs.libxcb

     

       
52
       
52
       
-
       
    xlibs.libxshmfence

     

       
53
       
53
       
-
       
    xlibs.xcbutil

     

       
54
       
54
       
-
       
    xlibs.xcbutilimage

     

       
55
       
55
       
-
       
    xlibs.xcbutilkeysyms

     

       
56
       
56
       
-
       
    xlibs.xcbutilrenderutil

     

       
57
       
57
       
-
       
    xlibs.xcbutilwm

     

       
49
       
49
       
+
       
    xorg.libXau

     

       
50
       
50
       
+
       
    xorg.libXdmcp

     

       
51
       
51
       
+
       
    xorg.libxcb

     

       
52
       
52
       
+
       
    xorg.libxshmfence

     

       
53
       
53
       
+
       
    xorg.xcbutil

     

       
54
       
54
       
+
       
    xorg.xcbutilimage

     

       
55
       
55
       
+
       
    xorg.xcbutilkeysyms

     

       
56
       
56
       
+
       
    xorg.xcbutilrenderutil

     

       
57
       
57
       
+
       
    xorg.xcbutilwm

     

       
58
       
58
       
 
       
    #xmlto docbook_xml_dtd_45 docbook_xsl

     

       
59
       
59
       
 
       
  ];

     

       
60
       
60
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, x11, lua, gettext, groff }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation {

     

       
4
       
4
       
 
       
  name = "ion-3-20090110";

     
···

       
10
       
10
       
 
       
    url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;

     

       
11
       
11
       
 
       
    sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
-
       
  buildInputs = [ x11 lua gettext groff ];

     

       
13
       
13
       
+
       
  buildInputs = [ xlibsWrapper lua gettext groff ];

     

       
14
       
14
       
 
       
  buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";

     

       
15
       
15
       
 
       
  installFlags = "PREFIX=\${out}";

     

       
16
       
16
       
 
       
}

     

···

       
4
       
4
       
 
       
  stdenv, fetchurl,

     

       
5
       
5
       
 
       
  lua, gettext, groff,

     

       
6
       
6
       
 
       
  pkgconfig, busybox,

     

       
7
       
7
       
-
       
  x11, libXinerama, libXrandr, libX11

     

       
7
       
7
       
+
       
  xlibsWrapper, libXinerama, libXrandr, libX11

     

       
8
       
8
       
 
       
}:

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
assert enableXft -> libXft != null;

     
···

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;

     

       
28
       
28
       
 
       
  postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";

     

       
29
       
29
       
-
       
  buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;

     

       
29
       
29
       
+
       
  buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
  buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";

     

       
32
       
32
       
 
       
  installFlags = "PREFIX=\${out}";

     

···

       
17
       
17
       
 
       
    substituteInPlace libqtile/manager.py --subst-var-by out $out

     

       
18
       
18
       
 
       
  '';

     

       
19
       
19
       
 
       


     

       
20
       
20
       
-
       
  buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];

     

       
20
       
20
       
+
       
  buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  cairocffi-xcffib = python27Packages.cairocffi.override {

     

       
23
       
23
       
-
       
    LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";

     

       
23
       
23
       
+
       
    LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";

     

       
24
       
24
       
 
       
    pythonPath = [ python27Packages.xcffib ];

     

       
25
       
25
       
 
       
  };

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];

     

       
28
       
28
       
 
       


     

       
29
       
29
       
-
       
  LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";

     

       
29
       
29
       
+
       
  LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
  postInstall = ''

     

       
32
       
32
       
 
       
    wrapProgram $out/bin/qtile \

     

       
33
       
33
       
-
       
      --prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \

     

       
33
       
33
       
+
       
      --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \

     

       
34
       
34
       
 
       
      --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \

     

       
35
       
35
       
 
       
      --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \

     

       
36
       
36
       
 
       
      --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb

     

       
2
       
2
       
-
       
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput

     

       
2
       
2
       
+
       
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput

     

       
3
       
3
       
 
       
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null

     

       
4
       
4
       
 
       
, libwebp ? null, xwayland ? null

     

       
5
       
5
       
 
       
# beware of null defaults, as the parameters *are* supplied by callPackage by default

     
···

       
15
       
15
       
 
       
  };

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  buildInputs = [

     

       
18
       
18
       
-
       
    pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm

     

       
18
       
18
       
+
       
    pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm

     

       
19
       
19
       
 
       
    mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva

     

       
20
       
20
       
 
       
    libwebp

     

       
21
       
21
       
 
       
  ];