···

       
48
       
48
       
 
       


     

       
49
       
49
       
 
       
  config = mkIf config.krb5.enable {

     

       
50
       
50
       
 
       


     

       
51
       
51
       
-
       
    environment.systemPackages = [ pkgs.krb5 ];

     

       
51
       
51
       
+
       
    environment.systemPackages = [ pkgs.krb5Full ];

     

       
52
       
52
       
 
       


     

       
53
       
53
       
 
       
    environment.etc."krb5.conf".text =

     

       
54
       
54
       
 
       
      ''

     

···

       
166
       
166
       
 
       
        script = "exec venus-planet ${configFile}";

     

       
167
       
167
       
 
       
        serviceConfig.User = "${cfg.user}";

     

       
168
       
168
       
 
       
        serviceConfig.Group = "${cfg.group}";

     

       
169
       
169
       
-
       
        environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

     

       
169
       
169
       
+
       
        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

     

       
170
       
170
       
 
       
        startAt = cfg.dates;

     

       
171
       
171
       
 
       
      };

     

       
172
       
172
       
 
       


     

···

       
67
       
67
       
 
       
    environment.sessionVariables =

     

       
68
       
68
       
 
       
      { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";

     

       
69
       
69
       
 
       
        # FIXME: unneeded - remove eventually.

     

       
70
       
70
       
-
       
        OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";

     

       
71
       
71
       
-
       
        # FIXME: unneeded - remove eventually.

     

       
72
       
70
       
 
       
        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-certificates.crt";

     

       
73
       
71
       
 
       
      };

     

       
74
       
72
       
 
       


     

···

       
28
       
28
       
 
       
  # Perform substitutions in all udev rules files.

     

       
29
       
29
       
 
       
  udevRules = stdenv.mkDerivation {

     

       
30
       
30
       
 
       
    name = "udev-rules";

     

       
31
       
31
       
+
       


     

       
31
       
32
       
 
       
    preferLocalBuild = true;

     

       
33
       
33
       
+
       
    allowSubstitutes = false;

     

       
34
       
34
       
+
       


     

       
32
       
35
       
 
       
    buildCommand = ''

     

       
33
       
36
       
 
       
      mkdir -p $out

     

       
34
       
37
       
 
       
      shopt -s nullglob

     

···

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  configDir = pkgs.stdenv.mkDerivation {

     

       
14
       
14
       
 
       
    name = "dbus-conf";

     

       
15
       
15
       
+
       


     

       
15
       
16
       
 
       
    preferLocalBuild = true;

     

       
17
       
17
       
+
       
    allowSubstitutes = false;

     

       
18
       
18
       
+
       


     

       
16
       
19
       
 
       
    buildCommand = ''

     

       
17
       
20
       
 
       
      mkdir -p $out

     

       
18
       
21
       
 
       


     

···

       
33
       
33
       
 
       
      makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \

     

       
34
       
34
       
 
       
        $out/greeter \

     

       
35
       
35
       
 
       
        --prefix PATH : "${pkgs.glibc}/bin" \

     

       
36
       
36
       
-
       
        --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \

     

       
36
       
36
       
+
       
        --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \

     

       
37
       
37
       
 
       
        --set GTK_PATH "${theme}:${pkgs.gtk3}" \

     

       
38
       
38
       
 
       
        --set GTK_EXE_PREFIX "${theme}" \

     

       
39
       
39
       
 
       
        --set GTK_DATA_PREFIX "${theme}" \

     

···

       
101
       
101
       
 
       
    if [] == failed then pkgs.stdenv.mkDerivation {

     

       
102
       
102
       
 
       
      name = "nixos-${config.system.nixosVersion}";

     

       
103
       
103
       
 
       
      preferLocalBuild = true;

     

       
104
       
104
       
+
       
      allowSubstitutes = false;

     

       
104
       
105
       
 
       
      buildCommand = systemBuilder;

     

       
105
       
106
       
 
       


     

       
106
       
107
       
 
       
      inherit (pkgs) utillinux coreutils;

     

···

       
13
       
13
       
 
       
      pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;

     

       
14
       
14
       
 
       
    in

     

       
15
       
15
       
 
       
    if unit.enable then

     

       
16
       
16
       
-
       
      pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }

     

       
16
       
16
       
+
       
      pkgs.runCommand "unit-${pathSafeName}"

     

       
17
       
17
       
+
       
        { preferLocalBuild = true;

     

       
18
       
18
       
+
       
          allowSubstitutes = false;

     

       
19
       
19
       
+
       
          inherit (unit) text;

     

       
20
       
20
       
+
       
        }

     

       
17
       
21
       
 
       
        ''

     

       
18
       
22
       
 
       
          mkdir -p $out

     

       
19
       
23
       
 
       
          echo -n "$text" > $out/${shellEscape name}

     

       
20
       
24
       
 
       
        ''

     

       
21
       
25
       
 
       
    else

     

       
22
       
22
       
-
       
      pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; }

     

       
26
       
26
       
+
       
      pkgs.runCommand "unit-${pathSafeName}-disabled"

     

       
27
       
27
       
+
       
        { preferLocalBuild = true;

     

       
28
       
28
       
+
       
          allowSubstitutes = false;

     

       
29
       
29
       
+
       
        }

     

       
23
       
30
       
 
       
        ''

     

       
24
       
31
       
 
       
          mkdir -p $out

     

       
25
       
32
       
 
       
          ln -s /dev/null $out/${shellEscape name}

     
···

       
89
       
96
       
 
       
        as));

     

       
90
       
97
       
 
       


     

       
91
       
98
       
 
       
  generateUnits = type: units: upstreamUnits: upstreamWants:

     

       
92
       
92
       
-
       
    pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''

     

       
99
       
99
       
+
       
    pkgs.runCommand "${type}-units"

     

       
100
       
100
       
+
       
      { preferLocalBuild = true;

     

       
101
       
101
       
+
       
        allowSubstitutes = false;

     

       
102
       
102
       
+
       
      } ''

     

       
93
       
103
       
 
       
      mkdir -p $out

     

       
94
       
104
       
 
       


     

       
95
       
105
       
 
       
      # Copy the upstream systemd units we're interested in.

     

···

       
14
       
14
       
 
       
    builder = ./make-etc.sh;

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
    preferLocalBuild = true;

     

       
17
       
17
       
+
       
    allowSubstitutes = false;

     

       
17
       
18
       
 
       


     

       
18
       
19
       
 
       
    /* !!! Use toXML. */

     

       
19
       
20
       
 
       
    sources = map (x: x.source) etc';

     

···

       
11
       
11
       
 
       
    substituteInPlace Makefile \

     

       
12
       
12
       
 
       
      --replace "/usr/local" "$out" \

     

       
13
       
13
       
 
       
      --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \

     

       
14
       
14
       
-
       
      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib "

     

       
14
       
14
       
+
       
      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " \

     

       
15
       
15
       
+
       
      --replace "-lcurses" "-lncurses"

     

       
15
       
16
       
 
       
  '';

     

       
16
       
17
       
 
       
  preBuild = ''

     

       
17
       
18
       
 
       
    mkdir -p $out/bin

     

···

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       
  version = "5.2.0";

     

       
5
       
5
       
 
       
  bsh = fetchurl {

     

       
6
       
6
       
-
       
    url = http://www.beanshell.org/bsh-2.0b4.jar;

     

       
7
       
7
       
-
       
    sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci";

     

       
6
       
6
       
+
       
    url = http://www.beanshell.org/bsh-2.0b5.jar;

     

       
7
       
7
       
+
       
    sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";

     

       
8
       
8
       
 
       
  };

     

       
9
       
9
       
 
       
  bcpg = fetchurl {

     

       
10
       
10
       
 
       
    url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar;

     

···

       
1
       
1
       
-
       
{ stdenv, fetchhg, ncurses, gettext, pkgconfig }:

     

       
1
       
1
       
+
       
{ stdenv, fetchhg, ncurses, gettext, pkgconfig

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
# apple frameworks

     

       
4
       
4
       
+
       
, CoreServices, CoreData, Cocoa, Foundation, libobjc }:

     

       
2
       
5
       
 
       


     

       
3
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
7
       
 
       
  name = "vim-${version}";

     
···

       
11
       
14
       
 
       
    sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc";

     

       
12
       
15
       
 
       
  };

     

       
13
       
16
       
 
       


     

       
17
       
17
       
+
       
  # this makes maintainers very sad

     

       
18
       
18
       
+
       
  # open source CF doesn't have anything NSArray-related, causing linking errors. the

     

       
19
       
19
       
+
       
  # missing symbol is in system CoreFoundation.

     

       
20
       
20
       
+
       
  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin

     

       
21
       
21
       
+
       
    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";

     

       
22
       
22
       
+
       


     

       
14
       
23
       
 
       
  enableParallelBuilding = true;

     

       
15
       
24
       
 
       


     

       
16
       
16
       
-
       
  buildInputs = [ ncurses pkgconfig ];

     

       
25
       
25
       
+
       
  buildInputs = [ ncurses pkgconfig ]

     

       
26
       
26
       
+
       
    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];

     

       
17
       
27
       
 
       
  nativeBuildInputs = [ gettext ];

     

       
18
       
28
       
 
       


     

       
19
       
29
       
 
       
  configureFlags = [

     

···

       
5
       
5
       
 
       
# We need chmod +wx on dirs, not just chmod +w

     

       
6
       
6
       
 
       
dontMakeSourcesWritable=1

     

       
7
       
7
       
 
       
postUnpack() {

     

       
8
       
8
       
-
       
	find . -type d | xargs -n1 chmod +x

     

       
9
       
9
       
-
       
	find . -type d | xargs -n1 chmod +x

     

       
8
       
8
       
+
       
    find . -type d -exec chmod +x '{}' \;

     

       
10
       
9
       
 
       
}

     

       
11
       
10
       
 
       


     

       
12
       
11
       
 
       
preBuild() {

     

···

       
23
       
23
       
 
       
  buildPhase = "sh ./compile.sh";

     

       
24
       
24
       
 
       
  dontStrip = true;

     

       
25
       
25
       
 
       


     

       
26
       
26
       
-
       
  installPhase = "mkdir $out/bin/ && cp 3dfsb $out/bin/";

     

       
26
       
26
       
+
       
  installPhase = "mkdir -p $out/bin/ && cp 3dfsb $out/bin/";

     

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
  preFixup = ''

     

       
29
       
29
       
 
       
    wrapProgram $out/bin/3dfsb \

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng

     

       
2
       
2
       
-
       
, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite

     

       
2
       
2
       
+
       
, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite

     

       
3
       
3
       
 
       
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp

     

       
4
       
4
       
 
       
, xdg_utils

     

       
5
       
5
       
 
       
}:

     
···

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
  buildInputs =

     

       
25
       
25
       
 
       
    [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg

     

       
26
       
26
       
-
       
      fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils

     

       
26
       
26
       
+
       
      fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils

     

       
27
       
27
       
 
       
      pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil

     

       
28
       
28
       
 
       
      pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow

     

       
29
       
29
       
 
       
      pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw

     

···

       
17
       
17
       
 
       
    substituteInPlace src/redshift-gtk/redshift-gtk python \

     

       
18
       
18
       
 
       
      --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"

     

       
19
       
19
       
 
       
  '';

     

       
20
       
20
       
-
       


     

       
20
       
20
       
+
       
/*

     

       
21
       
21
       
 
       
  postInstall = ''

     

       
22
       
22
       
 
       
    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH

     

       
23
       
23
       
 
       
  '';

     

       
24
       
24
       
-
       


     

       
24
       
24
       
+
       
*/

     

       
25
       
25
       
 
       
  meta = with stdenv.lib; {

     

       
26
       
26
       
 
       
    inherit version;

     

       
27
       
27
       
 
       
    description = "Gradually change screen color temperature";

     

···

       
1
       
1
       
-
       
# This program used to come with xorg releases, but now I could only find it

     

       
2
       
2
       
-
       
# at http://www.x.org/releases/individual/.

     

       
3
       
3
       
-
       
# That is why this expression is not inside pkgs.xorg

     

       
4
       
4
       
-
       


     

       
5
       
5
       
-
       
{stdenv, fetchurl, libX11, pkgconfig}:

     

       
6
       
6
       
-
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
-
       
  name = "xlsfonts-1.0.4";

     

       
8
       
8
       
-
       


     

       
9
       
9
       
-
       
  src = fetchurl {

     

       
10
       
10
       
-
       
    url = "mirror://xorg/individual/app/${name}.tar.bz2";

     

       
11
       
11
       
-
       
    sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";

     

       
12
       
12
       
-
       
  };

     

       
13
       
13
       
-
       


     

       
14
       
14
       
-
       
  buildInputs = [libX11 pkgconfig];

     

       
15
       
15
       
-
       


     

       
16
       
16
       
-
       
  meta = {

     

       
17
       
17
       
-
       
    homepage = http://www.x.org/;

     

       
18
       
18
       
-
       
    description = "Lists the fonts available in the X server";

     

       
19
       
19
       
-
       
    license = stdenv.lib.licenses.free;

     

       
20
       
20
       
-
       
    maintainers = with stdenv.lib.maintainers; [viric];

     

       
21
       
21
       
-
       
    platforms = with stdenv.lib.platforms; linux ++ darwin;

     

       
22
       
22
       
-
       
  };

     

       
23
       
23
       
-
       
}

     

···

       
62
       
62
       
 
       
      --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \

     

       
63
       
63
       
 
       
      --prefix "HOME" : "$out/share/panamax-api" \

     

       
64
       
64
       
 
       
      --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \

     

       
65
       
65
       
-
       
      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \

     

       
66
       
65
       
 
       
      --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \

     

       
67
       
66
       
 
       
      --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"

     

       
68
       
67
       
 
       
  '';

     

···

       
43
       
43
       
 
       
  postPatch = ''

     

       
44
       
44
       
 
       
    substituteInPlace login.tcl --replace \

     

       
45
       
45
       
 
       
      "custom::defvar loginconf(sslcacertstore) \"\"" \

     

       
46
       
46
       
-
       
      "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"

     

       
46
       
46
       
+
       
      "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)"

     

       
47
       
47
       
 
       
  '' + optionalString (theme != null) ''

     

       
48
       
48
       
 
       
    themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"

     

       
49
       
49
       
 
       
    sed -i '/^if.*load_default_xrdb/,/^}$/ {

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls

     

       
2
       
2
       
 
       
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile

     

       
3
       
3
       
-
       
, pythonPackages, cacert, cmake, makeWrapper

     

       
3
       
3
       
+
       
, pythonPackages, cacert, cmake, makeWrapper, libobjc

     

       
4
       
4
       
 
       
, extraBuildInputs ? [] }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     
···

       
16
       
16
       
 
       
    [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig

     

       
17
       
17
       
 
       
      libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper

     

       
18
       
18
       
 
       
      cacert cmake ]

     

       
19
       
19
       
+
       
    ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ]

     

       
19
       
20
       
 
       
    ++ extraBuildInputs;

     

       
20
       
21
       
 
       


     

       
21
       
22
       
 
       
  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt";

     

···

       
28
       
28
       
 
       
  ];

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  preFixup = ''

     

       
31
       
31
       
-
       
    rm $out/share/icons/hicolor/icon-theme.cache

     

       
32
       
32
       
-
       


     

       
33
       
31
       
 
       
    for f in "$out"/bin/*; do

     

       
34
       
32
       
 
       
      wrapProgram "$f" \

     

       
35
       
33
       
 
       
        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \

     

···

       
5
       
5
       
 
       
 		return;

     

       
6
       
6
       
 
       
 	}

     

       
7
       
7
       
 
       
 

     

       
8
       
8
       
-
       
+	$smtp_ssl_cert_path //= $ENV{'OPENSSL_X509_CERT_FILE'};

     

       
8
       
8
       
+
       
+	$smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'};

     

       
9
       
9
       
 
       
+

     

       
10
       
10
       
 
       
 	if (!defined $smtp_ssl_cert_path) {

     

       
11
       
11
       
 
       
 		# use the OpenSSL defaults

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich

     

       
2
       
2
       
-
       
, guiSupport ? false, tk ? null, curses, cacert }:

     

       
2
       
2
       
+
       
, guiSupport ? false, tk ? null, curses, cacert

     

       
3
       
3
       
+
       


     

       
4
       
4
       
+
       
, ApplicationServices }:

     

       
3
       
5
       
 
       


     

       
4
       
6
       
 
       
let

     

       
5
       
7
       
 
       
  version = "3.3.3";

     
···

       
18
       
20
       
 
       
  pythonPackages = [ curses ];

     

       
19
       
21
       
 
       


     

       
20
       
22
       
 
       
  buildInputs = [ python makeWrapper docutils unzip ];

     

       
23
       
23
       
+
       


     

       
24
       
24
       
+
       
  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices;

     

       
21
       
25
       
 
       


     

       
22
       
26
       
 
       
  makeFlags = "PREFIX=$(out)";

     

       
23
       
27
       
 
       


     

···

       
37
       
37
       
 
       
    ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}

     

       
38
       
38
       
 
       
    ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}

     

       
39
       
39
       
 
       
    ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}

     

       
40
       
40
       
-
       
    ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}

     

       
40
       
40
       
+
       
    --disable-keychain

     

       
41
       
41
       
 
       
    ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}

     

       
42
       
42
       
 
       
    ${if httpSupport then "--with-serf=${serf}" else "--without-serf"}

     

       
43
       
43
       
 
       
    --with-zlib=${zlib}

     

···

       
1
       
1
       
+
       
{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4

     

       
2
       
2
       
+
       
# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>

     

       
3
       
3
       
+
       
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:

     

       
4
       
4
       
+
       


     

       
5
       
5
       
+
       
let version = "2.4"; in

     

       
6
       
6
       
+
       
stdenv.mkDerivation {

     

       
7
       
7
       
+
       
  name = "minitube-${version}";

     

       
8
       
8
       
+
       


     

       
9
       
9
       
+
       
  src = fetchFromGitHub {

     

       
10
       
10
       
+
       
    sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";

     

       
11
       
11
       
+
       
    rev = version;

     

       
12
       
12
       
+
       
    repo = "minitube";

     

       
13
       
13
       
+
       
    owner = "flaviotordini";

     

       
14
       
14
       
+
       
  };

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  meta = with stdenv.lib; {

     

       
17
       
17
       
+
       
    inherit version;

     

       
18
       
18
       
+
       
    description = "Stand-alone YouTube video player";

     

       
19
       
19
       
+
       
    longDescription = ''

     

       
20
       
20
       
+
       
      Watch YouTube videos in a new way: you type a keyword, Minitube gives

     

       
21
       
21
       
+
       
      you an endless video stream. Minitube is not about cloning the YouTube

     

       
22
       
22
       
+
       
      website, it aims to create a new TV-like experience.

     

       
23
       
23
       
+
       
    '';

     

       
24
       
24
       
+
       
    homepage = http://flavio.tordini.org/minitube;

     

       
25
       
25
       
+
       
    license = licenses.gpl3Plus;

     

       
26
       
26
       
+
       
    platforms = with platforms; linux;

     

       
27
       
27
       
+
       
    maintainers = with maintainers; [ nckx ];

     

       
28
       
28
       
+
       
  };

     

       
29
       
29
       
+
       


     

       
30
       
30
       
+
       
  buildInputs = [ phonon phonon_backend_vlc qt4 ];

     

       
31
       
31
       
+
       
  nativeBuildInputs = [ makeWrapper ];

     

       
32
       
32
       
+
       


     

       
33
       
33
       
+
       
  configurePhase = ''

     

       
34
       
34
       
+
       
    qmake PREFIX=$out "DEFINES += APP_GOOGLE_API_KEY=${withAPIKey}"

     

       
35
       
35
       
+
       
  '';

     

       
36
       
36
       
+
       


     

       
37
       
37
       
+
       
  enableParallelBuilding = true;

     

       
38
       
38
       
+
       


     

       
39
       
39
       
+
       
  postInstall = ''

     

       
40
       
40
       
+
       
    wrapProgram $out/bin/minitube \

     

       
41
       
41
       
+
       
      --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"

     

       
42
       
42
       
+
       
  '';

     

       
43
       
43
       
+
       
}

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage

     

       
2
       
2
       
-
       
, libXrender, libXext }:

     

       
3
       
3
       
-
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
-
       
  name = "xcompmgr-1.1.6";

     

       
5
       
5
       
-
       
  src = fetchurl {

     

       
6
       
6
       
-
       
    url = "mirror://xorg/individual/app/${name}.tar.bz2";

     

       
7
       
7
       
-
       
    sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";

     

       
8
       
8
       
-
       
  };

     

       
9
       
9
       
-
       
  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];

     

       
10
       
10
       
-
       
  meta = {

     

       
11
       
11
       
-
       
    homepage = http://www.x.org/;

     

       
12
       
12
       
-
       
    description = "A sample compositing manager for X servers";

     

       
13
       
13
       
-
       
    longDescription = ''

     

       
14
       
14
       
-
       
      A sample compositing manager for X servers supporting the XFIXES,

     

       
15
       
15
       
-
       
      DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic eye-candy

     

       
16
       
16
       
-
       
      effects.

     

       
17
       
17
       
-
       
    '';

     

       
18
       
18
       
-
       
    license = "bsd";

     

       
19
       
19
       
-
       
    maintainers = with stdenv.lib.maintainers; [ astsmtl ];

     

       
20
       
20
       
-
       
    platforms = with stdenv.lib.platforms; linux;

     

       
21
       
21
       
-
       
  };

     

       
22
       
22
       
-
       
}

     

···

       
9
       
9
       
 
       
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell

     

       
10
       
10
       
 
       
, zlib ? null, extraPackages ? []

     

       
11
       
11
       
 
       
, dyld ? null # TODO: should this be a setup-hook on dyld?

     

       
12
       
12
       
-
       
, setupHook ? ./setup-hook.sh

     

       
13
       
12
       
 
       
, isGNU ? false, isClang ? false

     

       
14
       
13
       
 
       
}:

     

       
15
       
14
       
 
       


     
···

       
227
       
226
       
 
       
    ''

     

       
228
       
227
       
 
       


     

       
229
       
228
       
 
       
    + ''

     

       
230
       
230
       
-
       
      substituteAll ${setupHook} $out/nix-support/setup-hook.tmp

     

       
229
       
229
       
+
       
      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp

     

       
231
       
230
       
 
       
      cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook

     

       
232
       
231
       
 
       
      rm $out/nix-support/setup-hook.tmp

     

       
233
       
232
       
 
       


     

···

       
1
       
1
       
-
       
# This is an alternate setup hook for gcc-wrapper that uses the -I flag to

     

       
2
       
2
       
-
       
# add include search paths instead of -isystem. We need this for some packages

     

       
3
       
3
       
-
       
# because -isystem can change the search order specified by prior -I flags.

     

       
4
       
4
       
-
       
# Changing the search order can point gcc to the wrong package's headers.

     

       
5
       
5
       
-
       
# The -I flag will never change the order of prior flags.

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
export NIX_CC=@out@

     

       
8
       
8
       
-
       


     

       
9
       
9
       
-
       
addCVars () {

     

       
10
       
10
       
-
       
    if [ -d $1/include ]; then

     

       
11
       
11
       
-
       
        export NIX_CFLAGS_COMPILE+=" -I $1/include"

     

       
12
       
12
       
-
       
    fi

     

       
13
       
13
       
-
       


     

       
14
       
14
       
-
       
    if [ -d $1/lib64 -a ! -L $1/lib64 ]; then

     

       
15
       
15
       
-
       
        export NIX_LDFLAGS+=" -L$1/lib64"

     

       
16
       
16
       
-
       
    fi

     

       
17
       
17
       
-
       


     

       
18
       
18
       
-
       
    if [ -d $1/lib ]; then

     

       
19
       
19
       
-
       
        export NIX_LDFLAGS+=" -L$1/lib"

     

       
20
       
20
       
-
       
    fi

     

       
21
       
21
       
-
       
}

     

       
22
       
22
       
-
       


     

       
23
       
23
       
-
       
envHooks+=(addCVars)

     

       
24
       
24
       
-
       


     

       
25
       
25
       
-
       
# Note: these come *after* $out in the PATH (see setup.sh).

     

       
26
       
26
       
-
       


     

       
27
       
27
       
-
       
if [ -n "@gcc@" ]; then

     

       
28
       
28
       
-
       
    addToSearchPath PATH @gcc@/bin

     

       
29
       
29
       
-
       
fi

     

       
30
       
30
       
-
       


     

       
31
       
31
       
-
       
if [ -n "@binutils@" ]; then

     

       
32
       
32
       
-
       
    addToSearchPath PATH @binutils@/bin

     

       
33
       
33
       
-
       
fi

     

       
34
       
34
       
-
       


     

       
35
       
35
       
-
       
if [ -n "@libc@" ]; then

     

       
36
       
36
       
-
       
    addToSearchPath PATH @libc@/bin

     

       
37
       
37
       
-
       
fi

     

       
38
       
38
       
-
       


     

       
39
       
39
       
-
       
if [ -n "@coreutils@" ]; then

     

       
40
       
40
       
-
       
    addToSearchPath PATH @coreutils@/bin

     

       
41
       
41
       
-
       
fi

     

       
42
       
42
       
-
       


     

       
43
       
43
       
-
       
export CC=gcc

     

       
44
       
44
       
-
       
export CXX=g++

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
addCVars () {

     

       
4
       
4
       
 
       
    if [ -d $1/include ]; then

     

       
5
       
5
       
-
       
        export NIX_CFLAGS_COMPILE+=" -isystem $1/include"

     

       
5
       
5
       
+
       
        export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"

     

       
6
       
6
       
 
       
    fi

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
    if [ -d $1/lib64 -a ! -L $1/lib64 ]; then

     

···

       
23
       
23
       
 
       
        passAsFile = [ "text" ];

     

       
24
       
24
       
 
       
        # Pointless to do this on a remote machine.

     

       
25
       
25
       
 
       
        preferLocalBuild = true;

     

       
26
       
26
       
+
       
        allowSubstitutes = false;

     

       
26
       
27
       
 
       
      }

     

       
27
       
28
       
 
       
      ''

     

       
28
       
29
       
 
       
        n=$out${destination}

     

···

       
1
       
1
       
 
       
{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
-
       
let version = "2.34" ; in

     

       
3
       
3
       
+
       
let version = "2.35" ; in

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
6
       
 
       
  name = "dejavu-fonts-${version}";

     
···

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  src = fetchurl {

     

       
20
       
20
       
 
       
    url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";

     

       
21
       
21
       
-
       
    sha256 = "09wh9c9kk82i4kwy73fcqa0779bvf0ncikciqw2gxa9m2rkrxjmm";

     

       
21
       
21
       
+
       
    sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4";

     

       
22
       
22
       
 
       
  };

     

       
23
       
23
       
 
       
  buildFlags = "full-ttf";

     

       
24
       
24
       
 
       
  preBuild = ''

     

···

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";

     

       
13
       
13
       
 
       


     

       
14
       
14
       
-
       
  preBuild = "patchShebangs ./scripts";

     

       
15
       
15
       
-
       


     

       
16
       
14
       
 
       
  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];

     

       
17
       
15
       
 
       


     

       
18
       
16
       
 
       
  meta = {

     

···

       
38
       
38
       
 
       
  '';

     

       
39
       
39
       
 
       


     

       
40
       
40
       
 
       
  preFixup = ''

     

       
41
       
41
       
-
       
    wrapProgram "$out/libexec/gnome-user-share" \

     

       
41
       
41
       
+
       
    wrapProgram "$out/libexec/gnome-user-share-webdav" \

     

       
42
       
42
       
 
       
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       
43
       
43
       
 
       
      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

     

       
44
       
44
       
 
       
  '';

     

···

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  p_name  = "exo";

     

       
5
       
5
       
 
       
  ver_maj = "0.10";

     

       
6
       
6
       
-
       
  ver_min = "4";

     

       
6
       
6
       
+
       
  ver_min = "6";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
  src = fetchurl {

     

       
9
       
9
       
 
       
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       
10
       
10
       
-
       
    sha256 = "cced5fdbc0b61a5d976210ff71ecdd81b89fcd15e5860a44f50da7b83fb2deaa";

     

       
10
       
10
       
+
       
    sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752";

     

       
11
       
11
       
 
       
  };

     

       
12
       
12
       
 
       
  name = "${p_name}-${ver_maj}.${ver_min}";

     

       
13
       
13
       
 
       


     

···

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
 
       
  p_name  = "thunar";

     

       
8
       
8
       
 
       
  ver_maj = "1.6";

     

       
9
       
9
       
-
       
  ver_min = "6";

     

       
9
       
9
       
+
       
  ver_min = "10";

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  src = fetchurl {

     

       
12
       
12
       
 
       
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";

     

       
13
       
13
       
-
       
    sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr";

     

       
13
       
13
       
+
       
    sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       
  name = "${p_name}-${ver_maj}.${ver_min}";

     

       
16
       
16
       
 
       


     

···

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  p_name  = "xfdesktop";

     

       
6
       
6
       
 
       
  ver_maj = "4.12";

     

       
7
       
7
       
-
       
  ver_min = "0";

     

       
7
       
7
       
+
       
  ver_min = "2";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       
11
       
11
       
-
       
    sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf";

     

       
11
       
11
       
+
       
    sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       
  name = "${p_name}-${ver_maj}.${ver_min}";

     

       
14
       
14
       
 
       


     

···

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  p_name  = "xfwm4";

     

       
6
       
6
       
 
       
  ver_maj = "4.12";

     

       
7
       
7
       
-
       
  ver_min = "2";

     

       
7
       
7
       
+
       
  ver_min = "3";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";

     

       
11
       
11
       
-
       
    sha256 = "5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a";

     

       
11
       
11
       
+
       
    sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       
  name = "${p_name}-${ver_maj}.${ver_min}";

     

       
14
       
14
       
 
       


     

···

       
56
       
56
       
 
       
with stdenv.lib;

     

       
57
       
57
       
 
       
with builtins;

     

       
58
       
58
       
 
       


     

       
59
       
59
       
-
       
let version = "4.8.4";

     

       
59
       
59
       
+
       
let version = "4.8.5";

     

       
60
       
60
       
 
       


     

       
61
       
61
       
 
       
    # Whether building a cross-compiler for GNU/Hurd.

     

       
62
       
62
       
 
       
    crossGNU = cross != null && cross.config == "i586-pc-gnu";

     
···

       
209
       
209
       
 
       


     

       
210
       
210
       
 
       
  builder = ../builder.sh;

     

       
211
       
211
       
 
       


     

       
212
       
212
       
+
       
  outputs = [ "out" "info" ];

     

       
213
       
213
       
+
       


     

       
212
       
214
       
 
       
  src = fetchurl {

     

       
213
       
215
       
 
       
    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";

     

       
214
       
214
       
-
       
    sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";

     

       
216
       
216
       
+
       
    sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2";

     

       
215
       
217
       
 
       
  };

     

       
216
       
218
       
 
       


     

       
217
       
219
       
 
       
  inherit patches;

     

···

       
56
       
56
       
 
       
with stdenv.lib;

     

       
57
       
57
       
 
       
with builtins;

     

       
58
       
58
       
 
       


     

       
59
       
59
       
-
       
let version = "4.9.2";

     

       
59
       
59
       
+
       
let version = "4.9.3";

     

       
60
       
60
       
 
       


     

       
61
       
61
       
 
       
    # Whether building a cross-compiler for GNU/Hurd.

     

       
62
       
62
       
 
       
    crossGNU = cross != null && cross.config == "i586-pc-gnu";

     
···

       
208
       
208
       
 
       


     

       
209
       
209
       
 
       
  builder = ../builder.sh;

     

       
210
       
210
       
 
       


     

       
211
       
211
       
+
       
  outputs = [ "out" "info" ];

     

       
212
       
212
       
+
       


     

       
211
       
213
       
 
       
  src = fetchurl {

     

       
212
       
214
       
 
       
    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";

     

       
213
       
213
       
-
       
    sha256 = "1pbjp4blk2ycaa6r3jmw4ky5f1s9ji3klbqgv8zs2sl5jn1cj810";

     

       
215
       
215
       
+
       
    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";

     

       
214
       
216
       
 
       
  };

     

       
215
       
217
       
 
       


     

       
216
       
218
       
 
       
  inherit patches;

     

···

       
57
       
57
       
 
       
with stdenv.lib;

     

       
58
       
58
       
 
       
with builtins;

     

       
59
       
59
       
 
       


     

       
60
       
60
       
-
       
let version = "5.1.0";

     

       
60
       
60
       
+
       
let version = "5.2.0";

     

       
61
       
61
       
 
       


     

       
62
       
62
       
 
       
    # Whether building a cross-compiler for GNU/Hurd.

     

       
63
       
63
       
 
       
    crossGNU = cross != null && cross.config == "i586-pc-gnu";

     
···

       
210
       
210
       
 
       


     

       
211
       
211
       
 
       
  src = fetchurl {

     

       
212
       
212
       
 
       
    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";

     

       
213
       
213
       
-
       
    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";

     

       
213
       
213
       
+
       
    sha256 = "1bccp8a106xwz3wkixn65ngxif112vn90qf95m6lzpgpnl25p0sz";

     

       
214
       
214
       
 
       
  };

     

       
215
       
215
       
 
       


     

       
216
       
216
       
 
       
  inherit patches;

     

···

       
90
       
90
       
 
       
  configurePhase = ''

     

       
91
       
91
       
 
       
    ./configure --prefix=$out \

     

       
92
       
92
       
 
       
      --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \

     

       
93
       
93
       
-
       
      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"}

     

       
93
       
93
       
+
       
      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}

     

       
94
       
94
       
 
       
  '';

     

       
95
       
95
       
 
       


     

       
96
       
96
       
 
       
  # Stripping combined with patchelf breaks the executables (they die

     

···

       
33
       
33
       
 
       
    export NIX_LDFLAGS+=" -no_dtrace_dof"

     

       
34
       
34
       
 
       
  '';

     

       
35
       
35
       
 
       


     

       
36
       
36
       
-
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"

     

       
36
       
36
       
+
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"

     

       
37
       
37
       
 
       
                                      else "--with-gcc=${stdenv.cc}/bin/gcc";

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

     

···

       
33
       
33
       
 
       
    export NIX_LDFLAGS+=" -no_dtrace_dof"

     

       
34
       
34
       
 
       
  '';

     

       
35
       
35
       
 
       


     

       
36
       
36
       
-
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"

     

       
36
       
36
       
+
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"

     

       
37
       
37
       
 
       
                                      else "--with-gcc=${stdenv.cc}/bin/gcc";

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

     

···

       
90
       
90
       
 
       
  configurePhase = ''

     

       
91
       
91
       
 
       
    ./configure --prefix=$out \

     

       
92
       
92
       
 
       
      --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \

     

       
93
       
93
       
-
       
      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"}

     

       
93
       
93
       
+
       
      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}

     

       
94
       
94
       
 
       
  '';

     

       
95
       
95
       
 
       


     

       
96
       
96
       
 
       
  # Stripping combined with patchelf breaks the executables (they die

     

···

       
36
       
36
       
 
       
    export NIX_LDFLAGS+=" -no_dtrace_dof"

     

       
37
       
37
       
 
       
  '';

     

       
38
       
38
       
 
       


     

       
39
       
39
       
-
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"

     

       
39
       
39
       
+
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"

     

       
40
       
40
       
 
       
                                      else "--with-gcc=${stdenv.cc}/bin/gcc";

     

       
41
       
41
       
 
       


     

       
42
       
42
       
 
       
  # required, because otherwise all symbols from HSffi.o are stripped, and

     

···

       
52
       
52
       
 
       
    export NIX_LDFLAGS+=" -no_dtrace_dof"

     

       
53
       
53
       
 
       
  '';

     

       
54
       
54
       
 
       


     

       
55
       
55
       
-
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"

     

       
55
       
55
       
+
       
  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"

     

       
56
       
56
       
 
       
                                      else "--with-gcc=${stdenv.cc}/bin/gcc";

     

       
57
       
57
       
 
       


     

       
58
       
58
       
 
       
  postInstall = ''

     

···

       
66
       
66
       
 
       
    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c

     

       
67
       
67
       
 
       
  '';

     

       
68
       
68
       
 
       


     

       
69
       
69
       
-
       
  patches = [ ./cacert-1.2.patch ];

     

       
69
       
69
       
+
       
  patches = [ ./cacert-1.2.patch ./R_386_GOT32.patch ];

     

       
70
       
70
       
 
       


     

       
71
       
71
       
 
       
  GOOS = if stdenv.isDarwin then "darwin" else "linux";

     

       
72
       
72
       
 
       
  GOARCH = if stdenv.isDarwin then "amd64"

     

···

       
1
       
1
       
-
       
{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }:

     

       
1
       
1
       
+
       
{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, goPackages

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
, Security }:

     

       
2
       
4
       
 
       


     

       
3
       
5
       
 
       
let

     

       
4
       
6
       
 
       
  loader386 = "${glibc}/lib/ld-linux.so.2";

     
···

       
17
       
19
       
 
       


     

       
18
       
20
       
 
       
  # perl is used for testing go vet

     

       
19
       
21
       
 
       
  buildInputs = [ bison bash makeWrapper perl ]

     

       
20
       
20
       
-
       
             ++ lib.optionals stdenv.isLinux [ glibc ]

     

       
21
       
21
       
-
       
             ++ lib.optionals stdenv.isDarwin [ Security ];

     

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

     

       
23
       
23
       
+
       


     

       
24
       
24
       
+
       
  propagatedBuildInputs = lib.optional stdenv.isDarwin Security;

     

       
22
       
25
       
 
       


     

       
23
       
26
       
 
       
  # I'm not sure what go wants from its 'src', but the go installation manual

     

       
24
       
27
       
 
       
  # describes an installation keeping the src.

     
···

       
56
       
59
       
 
       
    sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c

     

       
57
       
60
       
 
       
    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c

     

       
58
       
61
       
 
       
    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c

     

       
62
       
62
       
+
       
  '' + lib.optionalString stdenv.isDarwin ''

     

       
63
       
63
       
+
       
    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go

     

       
64
       
64
       
+
       
    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go

     

       
65
       
65
       
+
       
    sed -i '/TestRead0/areturn' src/os/os_test.go

     

       
66
       
66
       
+
       
    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go

     

       
67
       
67
       
+
       


     

       
68
       
68
       
+
       
    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd

     

       
59
       
69
       
 
       
  '';

     

       
60
       
70
       
 
       


     

       
61
       
71
       
 
       
  patches = [

     

···

       
1
       
1
       
+
       
From 609d996fac7f68b34032572b7bde627f658b95f2 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
+
       
From: Russ Cox <rsc@golang.org>

     

       
3
       
3
       
+
       
Date: Mon, 6 Oct 2014 14:17:48 -0400

     

       
4
       
4
       
+
       
Subject: [PATCH] cmd/8l: accept R_386_GOT32 in push instruction

     

       
5
       
5
       
+
       


     

       
6
       
6
       
+
       
Fixes #8382.

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
LGTM=iant

     

       
9
       
9
       
+
       
R=iant

     

       
10
       
10
       
+
       
CC=golang-codereviews

     

       
11
       
11
       
+
       
https://golang.org/cl/149540045

     

       
12
       
12
       
+
       
---

     

       
13
       
13
       
+
       
 src/cmd/8l/asm.c | 18 +++++++++++++-----

     

       
14
       
14
       
+
       
 1 file changed, 13 insertions(+), 5 deletions(-)

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c

     

       
17
       
17
       
+
       
index c135dce..98c0424 100644

     

       
18
       
18
       
+
       
--- a/src/cmd/8l/asm.c

     

       
19
       
19
       
+
       
+++ b/src/cmd/8l/asm.c

     

       
20
       
20
       
+
       
@@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r)

     

       
21
       
21
       
+
       
 	case 256 + R_386_GOT32:

     

       
22
       
22
       
+
       
 		if(targ->type != SDYNIMPORT) {

     

       
23
       
23
       
+
       
 			// have symbol

     

       
24
       
24
       
+
       
-			// turn MOVL of GOT entry into LEAL of symbol itself

     

       
25
       
25
       
+
       
-			if(r->off < 2 || s->p[r->off-2] != 0x8b) {

     

       
26
       
26
       
+
       
-				diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);

     

       
27
       
27
       
+
       
+			if(r->off >= 2 && s->p[r->off-2] == 0x8b) {

     

       
28
       
28
       
+
       
+				// turn MOVL of GOT entry into LEAL of symbol address, relative to GOT.

     

       
29
       
29
       
+
       
+				s->p[r->off-2] = 0x8d;

     

       
30
       
30
       
+
       
+				r->type = R_GOTOFF;

     

       
31
       
31
       
+
       
 				return;

     

       
32
       
32
       
+
       
 			}

     

       
33
       
33
       
+
       
-			s->p[r->off-2] = 0x8d;

     

       
34
       
34
       
+
       
-			r->type = R_GOTOFF;

     

       
35
       
35
       
+
       
+			if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) {

     

       
36
       
36
       
+
       
+				// turn PUSHL of GOT entry into PUSHL of symbol itself.

     

       
37
       
37
       
+
       
+				// use unnecessary SS prefix to keep instruction same length.

     

       
38
       
38
       
+
       
+				s->p[r->off-2] = 0x36;

     

       
39
       
39
       
+
       
+				s->p[r->off-1] = 0x68;

     

       
40
       
40
       
+
       
+				r->type = R_ADDR;

     

       
41
       
41
       
+
       
+				return;

     

       
42
       
42
       
+
       
+			}

     

       
43
       
43
       
+
       
+			diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);

     

       
44
       
44
       
+
       
 			return;

     

       
45
       
45
       
+
       
 		}

     

       
46
       
46
       
+
       
 		addgotsym(ctxt, targ);

     

···

       
1
       
1
       
 
       
{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:

     

       
2
       
2
       
 
       
let

     

       
3
       
3
       
-
       
  callPackage = newScope (self // { inherit isl version fetch; });

     

       
3
       
3
       
+
       
  callPackage = newScope (self // { inherit stdenv isl version fetch; });

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
  version = "3.6.1";

     

       
6
       
6
       
 
       


     

···

       
27
       
27
       
 
       
    mv compiler-rt-* $sourceRoot/projects/compiler-rt

     

       
28
       
28
       
 
       
  '';

     

       
29
       
29
       
 
       


     

       
30
       
30
       
-
       
  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;

     

       
30
       
30
       
+
       
  buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  propagatedBuildInputs = [ ncurses zlib ];

     

       
33
       
33
       
 
       


     

···

       
84
       
84
       
 
       
  inherit version;

     

       
85
       
85
       
 
       
  inherit meta;

     

       
86
       
86
       
 
       


     

       
87
       
87
       
+
       
  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];

     

       
88
       
88
       
+
       


     

       
87
       
89
       
 
       
  src = if isRelease then

     

       
88
       
90
       
 
       
      fetchzip {

     

       
89
       
91
       
 
       
        url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";

     
···

       
107
       
109
       
 
       
    installPhase = ''

     

       
108
       
110
       
 
       
      mkdir -p "$out"

     

       
109
       
111
       
 
       
      cp -r bin "$out/bin"

     

       
110
       
110
       
-
       
    '' + (if stdenv.isLinux then ''

     

       
112
       
112
       
+
       
    '' + stdenv.lib.optionalString stdenv.isLinux ''

     

       
111
       
113
       
 
       
      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \

     

       
112
       
114
       
 
       
               --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \

     

       
113
       
115
       
 
       
               "$out/bin/rustc"

     

       
114
       
114
       
-
       
    '' else "");

     

       
116
       
116
       
+
       
    '';

     

       
115
       
117
       
 
       
  };

     

       
116
       
118
       
 
       


     

       
117
       
119
       
 
       
  configureFlags = configureFlags

     

       
118
       
118
       
-
       
                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ]

     

       
119
       
119
       
-
       
                ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";

     

       
120
       
120
       
+
       
                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]

     

       
121
       
121
       
+
       
                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";

     

       
120
       
122
       
 
       


     

       
121
       
123
       
 
       
  inherit patches;

     

       
122
       
124
       
 
       


     
···

       
139
       
141
       
 
       
      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"

     

       
140
       
142
       
 
       
  '';

     

       
141
       
143
       
 
       


     

       
142
       
142
       
-
       
  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];

     

       
144
       
144
       
+
       
  buildInputs = [ which file perl curl python27 makeWrapper git ]

     

       
145
       
145
       
+
       
    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ];

     

       
143
       
146
       
 
       


     

       
144
       
147
       
 
       
  enableParallelBuilding = true;

     

       
145
       
148
       
 
       


     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, bison, flex, boost, gputils ? null }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
-
       
  version = "3.4.0";

     

       
4
       
4
       
+
       
  version = "3.5.0";

     

       
5
       
5
       
 
       
  name = "sdcc-${version}";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  src = fetchurl {

     

       
8
       
8
       
 
       
    url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";

     

       
9
       
9
       
-
       
    sha256 = "1yavxffqdfhdyabdza936xxh9wq4cfwa385g26gjapsdp5ighsng";

     

       
9
       
9
       
+
       
    sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq";

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  # TODO: remove this comment when gputils != null is tested

     

···

       
186
       
186
       
 
       


     

       
187
       
187
       
 
       
  # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required

     

       
188
       
188
       
 
       
  # on darwin: https://github.com/NixOS/cabal2nix/issues/146

     

       
189
       
189
       
-
       
  hinotify = if pkgs.stdenv.isDarwin then super.hfsevents else super.hinotify;

     

       
189
       
189
       
+
       
  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;

     

       
190
       
190
       
+
       


     

       
191
       
191
       
+
       
  # hfsevents needs CoreServices in scope

     

       
192
       
192
       
+
       
  hfsevents = if pkgs.stdenv.isDarwin

     

       
193
       
193
       
+
       
    then addBuildTool super.hfsevents pkgs.darwin.apple_sdk.frameworks.CoreServices

     

       
194
       
194
       
+
       
    else super.hfsevents;

     

       
190
       
195
       
 
       


     

       
191
       
196
       
 
       
  # FSEvents API is very buggy and tests are unreliable. See

     

       
192
       
197
       
 
       
  # http://openradar.appspot.com/10207999 and similar issues

     

       
193
       
198
       
 
       
  fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;

     

       
194
       
199
       
 
       


     

       
200
       
200
       
+
       
  # the system-fileio tests use canonicalizePath, which fails in the sandbox

     

       
201
       
201
       
+
       
  system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;

     

       
202
       
202
       
+
       


     

       
195
       
203
       
 
       
  # Prevents needing to add security_tool as a build tool to all of x509-system's

     

       
196
       
204
       
 
       
  # dependencies.

     

       
197
       
197
       
-
       
  # TODO: use pkgs.darwin.security_tool once we can build it

     

       
198
       
198
       
-
       
  x509-system = let security_tool = "/usr";

     

       
199
       
199
       
-
       
  in overrideCabal super.x509-system (drv: {

     

       
200
       
200
       
-
       
    patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''

     

       
201
       
201
       
-
       
      substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security

     

       
202
       
202
       
-
       
    '';

     

       
203
       
203
       
-
       
  });

     

       
205
       
205
       
+
       
  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc

     

       
206
       
206
       
+
       
    then let inherit (pkgs.darwin) security_tool;

     

       
207
       
207
       
+
       
      in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {

     

       
208
       
208
       
+
       
        patchPhase = (drv.patchPhase or "") + ''

     

       
209
       
209
       
+
       
          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security

     

       
210
       
210
       
+
       
        '';

     

       
211
       
211
       
+
       
      })

     

       
212
       
212
       
+
       
    else super.x509-system;

     

       
213
       
213
       
+
       


     

       
214
       
214
       
+
       
  double-conversion = if !pkgs.stdenv.isDarwin

     

       
215
       
215
       
+
       
    then super.double-conversion

     

       
216
       
216
       
+
       
    else overrideCabal super.double-conversion (drv:

     

       
217
       
217
       
+
       
      {

     

       
218
       
218
       
+
       
        patchPhase = ''

     

       
219
       
219
       
+
       
          substituteInPlace double-conversion.cabal --replace stdc++ c++

     

       
220
       
220
       
+
       
        '';

     

       
221
       
221
       
+
       
      });

     

       
204
       
222
       
 
       


     

       
205
       
223
       
 
       
  # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"

     

       
206
       
224
       
 
       
  base_4_8_0_0 = markBroken super.base_4_8_0_0;

     
···

       
861
       
879
       
 
       


     

       
862
       
880
       
 
       
  # https://github.com/yesodweb/serversession/issues/1

     

       
863
       
881
       
 
       
  serversession = dontCheck super.serversession;

     

       
882
       
882
       
+
       


     

       
883
       
883
       
+
       
  yesod-bin = if pkgs.stdenv.isDarwin

     

       
884
       
884
       
+
       
    then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa

     

       
885
       
885
       
+
       
    else super.yesod-bin;

     

       
864
       
886
       
 
       


     

       
865
       
887
       
 
       
  # https://github.com/commercialhaskell/stack/issues/408

     

       
866
       
888
       
 
       
  # https://github.com/commercialhaskell/stack/issues/409

     

···

       
44
       
44
       
 
       
  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.

     

       
45
       
45
       
 
       
  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;

     

       
46
       
46
       
 
       


     

       
47
       
47
       
-
       
  # GHC 7.10.x's Haddock binary cannot generate hoogle files.

     

       
48
       
48
       
-
       
  # https://ghc.haskell.org/trac/ghc/ticket/9921

     

       
49
       
49
       
-
       
  mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });

     

       
50
       
50
       
-
       


     

       
51
       
47
       
 
       
  idris =

     

       
52
       
48
       
 
       
    let idris' = overrideCabal super.idris (drv: {

     

       
53
       
49
       
 
       
      # "idris" binary cannot find Idris library otherwise while building.

     
···

       
230
       
226
       
 
       
  QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;

     

       
231
       
227
       
 
       
  seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;

     

       
232
       
228
       
 
       
  vector_0_10_9_3 = markBroken super.vector_0_10_9_3;

     

       
233
       
233
       
-
       


     

       
234
       
234
       
-
       
  # https://github.com/purefn/hipbot/issues/1

     

       
235
       
235
       
-
       
  hipbot = dontDistribute super.hipbot;

     

       
236
       
229
       
 
       


     

       
237
       
230
       
 
       
  # https://github.com/HugoDaniel/RFC3339/issues/14

     

       
238
       
231
       
 
       
  timerep = dontCheck super.timerep;

     

···

       
24
       
24
       
 
       
    ++ lib.optional stdenv.isSunOS  ./ld-shared.patch

     

       
25
       
25
       
 
       
    ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;

     

       
26
       
26
       
 
       


     

       
27
       
27
       
+
       
  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd

     

       
28
       
28
       
+
       
  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them

     

       
29
       
29
       
+
       
  # while at the same time erasing the PATH environment variable so it unconditionally

     

       
30
       
30
       
+
       
  # fails. The code in question is guarded by a check for Mac OS, but the patch below

     

       
31
       
31
       
+
       
  # doesn't have any runtime effect on other platforms.

     

       
32
       
32
       
+
       
  postPatch = ''

     

       
33
       
33
       
+
       
    pwd="$(type -P pwd)"

     

       
34
       
34
       
+
       
    substituteInPlace dist/Cwd/Cwd.pm \

     

       
35
       
35
       
+
       
      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"

     

       
36
       
36
       
+
       
  '';

     

       
37
       
37
       
+
       


     

       
27
       
38
       
 
       
  # Build a thread-safe Perl with a dynamic libperls.o.  We need the

     

       
28
       
39
       
 
       
  # "installstyle" option to ensure that modules are put under

     

       
29
       
40
       
 
       
  # $out/lib/perl5 - this is the general default, but because $out

     

···

       
31
       
31
       
 
       
  patches =

     

       
32
       
32
       
 
       
    [ # Do not look in /usr etc. for dependencies.

     

       
33
       
33
       
 
       
      ./no-sys-dirs.patch

     

       
34
       
34
       
+
       
      # Remove in 5.20.3

     

       
35
       
35
       
+
       
      ./perl-5.20.2-gcc5_fixes-1.patch

     

       
34
       
36
       
 
       
    ]

     

       
35
       
37
       
 
       
    ++ optional stdenv.isSunOS ./ld-shared.patch

     

       
36
       
38
       
 
       
    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;

     

       
39
       
39
       
+
       


     

       
40
       
40
       
+
       
  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd

     

       
41
       
41
       
+
       
  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them

     

       
42
       
42
       
+
       
  # while at the same time erasing the PATH environment variable so it unconditionally

     

       
43
       
43
       
+
       
  # fails. The code in question is guarded by a check for Mac OS, but the patch below

     

       
44
       
44
       
+
       
  # doesn't have any runtime effect on other platforms.

     

       
45
       
45
       
+
       
  postPatch = stdenv.lib.optional (stdenv.isDarwin && !stdenv.cc.nativeLibc) ''

     

       
46
       
46
       
+
       
    pwd="$(type -P pwd)"

     

       
47
       
47
       
+
       
    substituteInPlace dist/PathTools/Cwd.pm \

     

       
48
       
48
       
+
       
      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"

     

       
49
       
49
       
+
       
  '';

     

       
37
       
50
       
 
       


     

       
38
       
51
       
 
       
  # Build a thread-safe Perl with a dynamic libperls.o.  We need the

     

       
39
       
52
       
 
       
  # "installstyle" option to ensure that modules are put under

     

···

       
1
       
1
       
+
       
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>

     

       
2
       
2
       
+
       
Date: 2015-04-17

     

       
3
       
3
       
+
       
Initial Package Version: 5.20.2

     

       
4
       
4
       
+
       
Upstream Status: Committed

     

       
5
       
5
       
+
       
Origin: Petr Pisař and Tony Cook

     

       
6
       
6
       
+
       
Description: Fixes Errno.pm and h2ph with gcc-5.

     

       
7
       
7
       
+
       


     

       
8
       
8
       
+
       
1. cherry-picked because the change to $version will not apply, from

     

       
9
       
9
       
+
       
commit 816b056ffb99ae54642320e20dc30a59fd1effef

     

       
10
       
10
       
+
       
Author: Petr Písař <ppisar@redhat.com>

     

       
11
       
11
       
+
       
Date:   Wed Feb 11 15:46:37 2015 +0100

     

       
12
       
12
       
+
       


     

       
13
       
13
       
+
       
    Fix Errno.pm generation for gcc-5.0

     

       
14
       
14
       
+
       
    

     

       
15
       
15
       
+
       
    gcc-5.0 -E interleaves now line numbers with expended macros, so that

     

       
16
       
16
       
+
       
    the generated errno.c will be preprocessed to

     

       
17
       
17
       
+
       
    

     

       
18
       
18
       
+
       
    EBFONT => [[

     

       
19
       
19
       
+
       
               59

     

       
20
       
20
       
+
       
                    ]]

     

       
21
       
21
       
+
       
    

     

       
22
       
22
       
+
       
    which is hard to parse in in line-based reader.

     

       
23
       
23
       
+
       
    

     

       
24
       
24
       
+
       
    So use -P option with gcc >= 5.0. Global -P usage would break makedepend,

     

       
25
       
25
       
+
       
    global -ftrack-macro-expansion=0 would break lib/h2ph.t.

     

       
26
       
26
       
+
       
    

     

       
27
       
27
       
+
       
    RT#123784

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL

     

       
30
       
30
       
+
       
index 3dadfce..c6bfa06 100644

     

       
31
       
31
       
+
       
--- a/ext/Errno/Errno_pm.PL

     

       
32
       
32
       
+
       
+++ b/ext/Errno/Errno_pm.PL

     

       
33
       
33
       
+
       
@@ -215,20 +215,31 @@ sub write_errno_pm {

     

       
34
       
34
       
+
       
     {	# BeOS (support now removed) did not enter this block

     

       
35
       
35
       
+
       
     # invoke CPP and read the output

     

       
36
       
36
       
+
       
 

     

       
37
       
37
       
+
       
+	my $inhibit_linemarkers = '';

     

       
38
       
38
       
+
       
+	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {

     

       
39
       
39
       
+
       
+	    # GCC 5.0 interleaves expanded macros with line numbers breaking

     

       
40
       
40
       
+
       
+	    # each line into multiple lines. RT#123784

     

       
41
       
41
       
+
       
+	    $inhibit_linemarkers = ' -P';

     

       
42
       
42
       
+
       
+	}

     

       
43
       
43
       
+
       
+

     

       
44
       
44
       
+
       
 	if ($^O eq 'VMS') {

     

       
45
       
45
       
+
       
-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";

     

       
46
       
46
       
+
       
+	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .

     

       
47
       
47
       
+
       
+		$inhibit_linemarkers . " $Config{cppminus}";

     

       
48
       
48
       
+
       
 	    $cpp =~ s/sys\$input//i;

     

       
49
       
49
       
+
       
 	    open(CPPO,"$cpp  errno.c |") or

     

       
50
       
50
       
+
       
 		die "Cannot exec $Config{cppstdin}";

     

       
51
       
51
       
+
       
 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {

     

       
52
       
52
       
+
       
-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or

     

       
53
       
53
       
+
       
-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";

     

       
54
       
54
       
+
       
+	    my $cpp = "$Config{cpprun} $Config{cppflags}" .

     

       
55
       
55
       
+
       
+		$inhibit_linemarkers;

     

       
56
       
56
       
+
       
+	    open(CPPO,"$cpp errno.c |") or

     

       
57
       
57
       
+
       
+		die "Cannot run '$cpp errno.c'";

     

       
58
       
58
       
+
       
 	} elsif ($IsSymbian) {

     

       
59
       
59
       
+
       
-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";

     

       
60
       
60
       
+
       
+            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .

     

       
61
       
61
       
+
       
+		$inhibit_linemarkers ." -";

     

       
62
       
62
       
+
       
 	    open(CPPO,"$cpp < errno.c |")

     

       
63
       
63
       
+
       
 		or die "Cannot exec $cpp";

     

       
64
       
64
       
+
       
         } else {

     

       
65
       
65
       
+
       
-	    my $cpp = default_cpp();

     

       
66
       
66
       
+
       
+	    my $cpp = default_cpp() . $inhibit_linemarkers;

     

       
67
       
67
       
+
       
 	    open(CPPO,"$cpp < errno.c |")

     

       
68
       
68
       
+
       
 		or die "Cannot exec $cpp";

     

       
69
       
69
       
+
       
 	}

     

       
70
       
70
       
+
       


     

       
71
       
71
       
+
       
commit 3bea78d24634e630b610f59957e7a019205a67b2

     

       
72
       
72
       
+
       
Author: Tony Cook <tony@develop-help.com>

     

       
73
       
73
       
+
       
Date:   Mon Feb 16 15:57:00 2015 +1100

     

       
74
       
74
       
+
       


     

       
75
       
75
       
+
       
    h2ph: correct handling of hex constants for the preamble

     

       
76
       
76
       
+
       
    

     

       
77
       
77
       
+
       
    Previously they were treated as identifiers resulting in code

     

       
78
       
78
       
+
       
    generated like C< &0xFFF >.

     

       
79
       
79
       
+
       
    

     

       
80
       
80
       
+
       
    We also try to prevent compile-time warnings from large hex integers,

     

       
81
       
81
       
+
       
    the user isn't responsible for the generated code, so we delay those

     

       
82
       
82
       
+
       
    warnings to run-time.

     

       
83
       
83
       
+
       


     

       
84
       
84
       
+
       
diff --git a/utils/h2ph.PL b/utils/h2ph.PL

     

       
85
       
85
       
+
       
index 9a8b14d..d082f22 100644

     

       
86
       
86
       
+
       
--- a/utils/h2ph.PL

     

       
87
       
87
       
+
       
+++ b/utils/h2ph.PL

     

       
88
       
88
       
+
       
@@ -769,7 +769,7 @@ sub inc_dirs

     

       
89
       
89
       
+
       
 sub build_preamble_if_necessary

     

       
90
       
90
       
+
       
 {

     

       
91
       
91
       
+
       
     # Increment $VERSION every time this function is modified:

     

       
92
       
92
       
+
       
-    my $VERSION     = 3;

     

       
93
       
93
       
+
       
+    my $VERSION     = 4;

     

       
94
       
94
       
+
       
     my $preamble    = "$Dest_dir/_h2ph_pre.ph";

     

       
95
       
95
       
+
       
 

     

       
96
       
96
       
+
       
     # Can we skip building the preamble file?

     

       
97
       
97
       
+
       
@@ -788,6 +788,11 @@ sub build_preamble_if_necessary

     

       
98
       
98
       
+
       
 

     

       
99
       
99
       
+
       
     open  PREAMBLE, ">$preamble" or die "Cannot open $preamble:  $!";

     

       
100
       
100
       
+
       
 	print PREAMBLE "# This file was created by h2ph version $VERSION\n";

     

       
101
       
101
       
+
       
+        # Prevent non-portable hex constants from warning.

     

       
102
       
102
       
+
       
+        #

     

       
103
       
103
       
+
       
+        # We still produce an overflow warning if we can't represent

     

       
104
       
104
       
+
       
+        # a hex constant as an integer.

     

       
105
       
105
       
+
       
+        print PREAMBLE "no warnings qw(portable);\n";

     

       
106
       
106
       
+
       
 

     

       
107
       
107
       
+
       
 	foreach (sort keys %define) {

     

       
108
       
108
       
+
       
 	    if ($opt_D) {

     

       
109
       
109
       
+
       
@@ -814,6 +819,18 @@ DEFINE

     

       
110
       
110
       
+
       
 		# integer:

     

       
111
       
111
       
+
       
 		print PREAMBLE

     

       
112
       
112
       
+
       
 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";

     

       
113
       
113
       
+
       
+            } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {

     

       
114
       
114
       
+
       
+                # hex integer

     

       
115
       
115
       
+
       
+                # Special cased, since perl warns on hex integers

     

       
116
       
116
       
+
       
+                # that can't be represented in a UV.

     

       
117
       
117
       
+
       
+                #

     

       
118
       
118
       
+
       
+                # This way we get the warning at time of use, so the user

     

       
119
       
119
       
+
       
+                # only gets the warning if they happen to use this

     

       
120
       
120
       
+
       
+                # platform-specific definition.

     

       
121
       
121
       
+
       
+                my $code = $1;

     

       
122
       
122
       
+
       
+                $code = "hex('$code')" if length $code > 10;

     

       
123
       
123
       
+
       
+                print PREAMBLE

     

       
124
       
124
       
+
       
+                    "unless (defined &$_) { sub $_() { $code } }\n\n";

     

       
125
       
125
       
+
       
 	    } elsif ($define{$_} =~ /^\w+$/) {

     

       
126
       
126
       
+
       
 		my $def = $define{$_};

     

       
127
       
127
       
+
       
 		if ($isatype{$def}) {