···

       
740
       
740
       
 
       
      enable: true

     

       
741
       
741
       
 
       
	  packages: [ zlib ]

     

       
742
       
742
       
 
       


     

       
743
       
743
       
-
       
Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an

     

       
743
       
743
       
+
       
Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` as an

     

       
744
       
744
       
 
       
`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you

     

       
745
       
745
       
 
       
can achieve the same effect by hand. First of all, run

     

       
746
       
746
       
 
       


     

···

       
291
       
291
       
 
       
  # Tests cannot import pyfftw. pyfftw works fine though.

     

       
292
       
292
       
 
       
  doCheck = false;

     

       
293
       
293
       
 
       


     

       
294
       
294
       
-
       
  LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"

     

       
295
       
295
       
-
       
  CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"

     

       
294
       
294
       
+
       
  LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"

     

       
295
       
295
       
+
       
  CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"

     

       
296
       
296
       
 
       
  '';

     

       
297
       
297
       
 
       


     

       
298
       
298
       
 
       
  meta = {

     

···

       
129
       
129
       
 
       
  ericbmerritt = "Eric Merritt <eric@afiniate.com>";

     

       
130
       
130
       
 
       
  ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";

     

       
131
       
131
       
 
       
  erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";

     

       
132
       
132
       
-
       
  ertes = "Ertugrul Söylemez <ertesx@gmx.de>";

     

       
132
       
132
       
+
       
  ertes = "Ertugrul Söylemez <esz@posteo.de>";

     

       
133
       
133
       
 
       
  exi = "Reno Reckling <nixos@reckling.org>";

     

       
134
       
134
       
 
       
  exlevan = "Alexey Levan <exlevan@gmail.com>";

     

       
135
       
135
       
 
       
  expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";

     

···

       
29
       
29
       
 
       
        cp ${./test-driver/Logger.pm} $libDir/Logger.pm

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
        wrapProgram $out/bin/nixos-test-driver \

     

       
32
       
32
       
-
       
          --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \

     

       
32
       
32
       
+
       
          --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \

     

       
33
       
33
       
 
       
          --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"

     

       
34
       
34
       
 
       
      '';

     

       
35
       
35
       
 
       
  };

     

···

       
121
       
121
       
 
       
      makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \

     

       
122
       
122
       
 
       
          ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \

     

       
123
       
123
       
 
       
          --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \

     

       
124
       
124
       
-
       
          --set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \

     

       
124
       
124
       
+
       
          --set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \

     

       
125
       
125
       
 
       
          --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \

     

       
126
       
126
       
 
       
          --run 'cd ${cfg.packages.gitlab}/share/gitlab'

     

       
127
       
127
       
 
       
      makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \

     

···

       
248
       
248
       
 
       
        description = ''

     

       
249
       
249
       
 
       
          List of binary cache URLs that non-root users can use (in

     

       
250
       
250
       
 
       
          addition to those specified using

     

       
251
       
251
       
-
       
          <option>nix.binaryCaches</option> by passing

     

       
251
       
251
       
+
       
          <option>nix.binaryCaches</option>) by passing

     

       
252
       
252
       
 
       
          <literal>--option binary-caches</literal> to Nix commands.

     

       
253
       
253
       
 
       
        '';

     

       
254
       
254
       
 
       
      };

     

···

       
465
       
465
       
 
       
          DJANGO_SETTINGS_MODULE = "graphite.settings";

     

       
466
       
466
       
 
       
          GRAPHITE_CONF_DIR = configDir;

     

       
467
       
467
       
 
       
          GRAPHITE_STORAGE_DIR = dataDir;

     

       
468
       
468
       
-
       
          LD_LIBRARY_PATH = "${pkgs.cairo}/lib";

     

       
468
       
468
       
+
       
          LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";

     

       
469
       
469
       
 
       
        };

     

       
470
       
470
       
 
       
        serviceConfig = {

     

       
471
       
471
       
 
       
          ExecStart = ''

     

···

       
133
       
133
       
 
       
          @{PROC}/sys/kernel/random/uuid   r,

     

       
134
       
134
       
 
       
          @{PROC}/sys/vm/overcommit_memory r,

     

       
135
       
135
       
 
       


     

       
136
       
136
       
-
       
          ${pkgs.openssl}/etc/**                     r,

     

       
136
       
136
       
+
       
          ${pkgs.openssl.out}/etc/**                     r,

     

       
137
       
137
       
 
       
          ${pkgs.transmission}/share/transmission/** r,

     

       
138
       
138
       
 
       


     

       
139
       
139
       
 
       
          owner ${settingsDir}/** rw,

     

···

       
169
       
169
       
 
       
      ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm

     

       
170
       
170
       
 
       
      ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa

     

       
171
       
171
       
 
       
      ++ lib.optional config.powerManagement.enable kde5.powerdevil

     

       
172
       
172
       
-
       
      ++ lib.optional config.services.colord.enable kde5.colord-kde

     

       
172
       
172
       
+
       
      ++ lib.optional config.services.colord.enable pkgs.colord-kde

     

       
173
       
173
       
 
       
      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];

     

       
174
       
174
       
 
       


     

       
175
       
175
       
 
       
    environment.pathsToLink = [ "/share" ];

     

···

       
134
       
134
       
 
       
        (*) echo "$0: Desktop manager '$desktopManager' not found.";;

     

       
135
       
135
       
 
       
      esac

     

       
136
       
136
       
 
       


     

       
137
       
137
       
+
       
      # FIXME: gdbus should not be in glib.dev!

     

       
137
       
138
       
 
       
      ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''

     

       
138
       
138
       
-
       
        ${pkgs.glib}/bin/gdbus call --session \

     

       
139
       
139
       
+
       
        ${pkgs.glib.dev}/bin/gdbus call --session \

     

       
139
       
140
       
 
       
          --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \

     

       
140
       
141
       
 
       
          --method org.freedesktop.DBus.UpdateActivationEnvironment \

     

       
141
       
142
       
 
       
          "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \

     

···

       
20
       
20
       
 
       
    services.xserver.windowManager.session = singleton

     

       
21
       
21
       
 
       
      { name = "metacity";

     

       
22
       
22
       
 
       
        start = ''

     

       
23
       
23
       
-
       
          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/

     

       
23
       
23
       
+
       
          env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/

     

       
24
       
24
       
 
       
          # !!! Hack: load the schemas for Metacity.

     

       
25
       
25
       
-
       
          GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \

     

       
25
       
25
       
+
       
          GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \

     

       
26
       
26
       
 
       
            --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */

     

       
27
       
27
       
 
       
          ${gnome.metacity}/bin/metacity &

     

       
28
       
28
       
 
       
          waitPID=$!

     

···

       
93
       
93
       
 
       
    boot.initrd.extraUtilsCommands = ''

     

       
94
       
94
       
 
       
      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear

     

       
95
       
95
       
 
       
      cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib

     

       
96
       
96
       
+
       


     

       
97
       
97
       
+
       
      ${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"}

     

       
98
       
98
       
+
       
      ${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"}

     

       
99
       
99
       
+
       
      ${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"}

     

       
96
       
100
       
 
       
    '';

     

       
97
       
101
       
 
       


     

       
98
       
102
       
 
       
    boot.initrd.extraUtilsCommandsTest = ''

     
···

       
108
       
112
       
 
       
      touch /var/log/lastlog

     

       
109
       
113
       
 
       


     

       
110
       
114
       
 
       
      mkdir -p /etc/dropbear

     

       
111
       
111
       
-
       
      ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}

     

       
112
       
112
       
-
       
      ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}

     

       
113
       
113
       
-
       
      ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}

     

       
115
       
115
       
+
       
      ${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"}

     

       
116
       
116
       
+
       
      ${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"}

     

       
117
       
117
       
+
       
      ${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"}

     

       
114
       
118
       
 
       


     

       
115
       
119
       
 
       
      mkdir -p /root/.ssh

     

       
116
       
120
       
 
       
      ${concatStrings (map (key: ''

     

···

       
11
       
11
       
 
       
{

     

       
12
       
12
       
 
       
  config = {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
-
       
    system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ];

     

       
14
       
14
       
+
       
    system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ];

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
    boot.initrd.availableKernelModules = mkIf inInitrd

     

       
17
       
17
       
 
       
      [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
    boot.initrd.extraUtilsCommands = mkIf inInitrd

     

       
20
       
20
       
 
       
      ''

     

       
21
       
21
       
-
       
        copy_bin_and_libs ${pkgs.cifs_utils}/sbin/mount.cifs

     

       
21
       
21
       
+
       
        copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs

     

       
22
       
22
       
 
       
      '';

     

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
  };

     

···

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
          postVM =

     

       
22
       
22
       
 
       
            ''

     

       
23
       
23
       
-
       
              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin

     

       
23
       
23
       
+
       
              PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}

     

       
24
       
24
       
 
       
              pushd $out

     

       
25
       
25
       
 
       
              ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2

     

       
26
       
26
       
 
       
              rm $diskImageBase

     

···

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
          postVM =

     

       
25
       
25
       
 
       
            ''

     

       
26
       
26
       
-
       
              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin

     

       
26
       
26
       
+
       
              PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}

     

       
27
       
27
       
 
       
              pushd $out

     

       
28
       
28
       
 
       
              mv $diskImageBase disk.raw

     

       
29
       
29
       
 
       
              tar -Szcf $diskImageBase.tar.gz disk.raw

     

···

       
4
       
4
       
 
       
with pkgs.lib;

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     

       
7
       
7
       
-
       
  testVMConfig = vmName: attrs: { config, pkgs, ... }: let

     

       
7
       
7
       
+
       
  testVMConfig = vmName: attrs: { config, pkgs, lib, ... }: let

     

       
8
       
8
       
 
       
    guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
    miniInit = ''

     

       
11
       
11
       
 
       
      #!${pkgs.stdenv.shell} -xe

     

       
12
       
12
       
-
       
      export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"

     

       
12
       
12
       
+
       
      export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
      mkdir -p /var/run/dbus

     

       
15
       
15
       
 
       
      cat > /etc/passwd <<EOF

     

···

       
25
       
25
       
 
       
  postFixup = ''

     

       
26
       
26
       
 
       
    for executable in $(cd $out/bin && ls); do

     

       
27
       
27
       
 
       
	wrapProgram $out/bin/$executable \

     

       
28
       
28
       
-
       
	  --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"

     

       
28
       
28
       
+
       
	  --prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}"

     

       
29
       
29
       
 
       
    done

     

       
30
       
30
       
 
       
  '';

     

       
31
       
31
       
 
       


     

···

       
1
       
1
       
 
       
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype

     

       
2
       
2
       
 
       
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis

     

       
3
       
3
       
-
       
, libsndfile, libogg

     

       
3
       
3
       
+
       
, libSM, libsndfile, libogg

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation {

     
···

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  buildInputs = [

     

       
16
       
16
       
 
       
    pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf

     

       
17
       
17
       
-
       
    liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg

     

       
17
       
17
       
+
       
    liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM

     

       
18
       
18
       
 
       
  ];

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  patches = [ ./am_path_sdl.patch ./xml.patch ];

     

···

       
5
       
5
       
 
       
pythonPackages.buildPythonApplication rec {

     

       
6
       
6
       
 
       
  name = "mopidy-${version}";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
-
       
  version = "2.0.0";

     

       
8
       
8
       
+
       
  version = "2.0.1";

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  src = fetchFromGitHub {

     

       
11
       
11
       
 
       
    owner = "mopidy";

     

       
12
       
12
       
 
       
    repo = "mopidy";

     

       
13
       
13
       
 
       
    rev = "v${version}";

     

       
14
       
14
       
-
       
    sha256 = "06f1y87dqc7p6kq5npmg3ki8x4iacyjzd7nq7188x20y2zglrjbm";

     

       
14
       
14
       
+
       
    sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp";

     

       
15
       
15
       
 
       
  };

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  nativeBuildInputs = [ wrapGAppsHook ];

     

···

       
22
       
22
       
 
       
    substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar"

     

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
    sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh

     

       
25
       
25
       
-
       
    sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=${swt}/lib:$out/lib:${acl}/lib#g" bin/areca_run.sh

     

       
25
       
25
       
+
       
    sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
    # https://sourceforge.net/p/areca/bugs/563/

     

       
28
       
28
       
 
       
    substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \

     

···

       
26
       
26
       
 
       
    interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)

     

       
27
       
27
       
 
       
    libCairo=$out/eclipse/libcairo-swt.so

     

       
28
       
28
       
 
       
    patchelf --set-interpreter $interpreter $out/eclipse/eclipse

     

       
29
       
29
       
-
       
    [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo

     

       
29
       
29
       
+
       
    [ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
    # Create wrapper script.  Pass -configuration to store

     

       
32
       
32
       
 
       
    # settings in ~/.eclipse/org.eclipse.platform_<version> rather

     
···

       
36
       
36
       
 
       


     

       
37
       
37
       
 
       
    makeWrapper $out/eclipse/eclipse $out/bin/eclipse \

     

       
38
       
38
       
 
       
      --prefix PATH : ${jdk}/bin \

     

       
39
       
39
       
-
       
      --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk.out}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \

     

       
39
       
39
       
+
       
      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \

     

       
40
       
40
       
 
       
      --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"

     

       
41
       
41
       
 
       


     

       
42
       
42
       
 
       
    # Create desktop item.

     

···

       
25
       
25
       
 
       
in

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
stdenv.mkDerivation rec {

     

       
28
       
28
       
-
       
  name = "emacs-25.1-rc1";

     

       
28
       
28
       
+
       
  name = "emacs-25.1-rc2";

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  builder = ./builder.sh;

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  src = fetchurl {

     

       
33
       
33
       
 
       
    url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";

     

       
34
       
34
       
-
       
    sha256 = "0cv1hars9zxlv040h7f3zz50fhn67dqa18ms4hg9sdblckk50360";

     

       
34
       
34
       
+
       
    sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v";

     

       
35
       
35
       
 
       
  };

     

       
36
       
36
       
 
       


     

       
37
       
37
       
 
       
  patches = lib.optionals stdenv.isDarwin [

     

···

       
62
       
62
       
 
       
    item=${desktopItem}

     

       
63
       
63
       
 
       


     

       
64
       
64
       
 
       
    makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \

     

       
65
       
65
       
-
       
      --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \

     

       
65
       
65
       
+
       
      --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \

     

       
66
       
66
       
 
       
      --set JDK_HOME "$jdk" \

     

       
67
       
67
       
 
       
      --set ${hiName}_JDK "$jdk" \

     

       
68
       
68
       
 
       
      --set ANDROID_JAVA_HOME "$jdk" \

     

···

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
    wrapProgram $out/bin/tuxguitar \

     

       
28
       
28
       
 
       
      --set JAVA "${jdk}/bin/java" \

     

       
29
       
29
       
-
       
      --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \

     

       
29
       
29
       
+
       
      --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \

     

       
30
       
30
       
 
       
      --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"

     

       
31
       
31
       
 
       
  '';

     

       
32
       
32
       
 
       


     

···

       
32
       
32
       
 
       
    mkdir -p $out/bin

     

       
33
       
33
       
 
       
    cp -a netbeans $out

     

       
34
       
34
       
 
       
    makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \

     

       
35
       
35
       
-
       
      --prefix PATH : ${jdk}/bin:${which}/bin \

     

       
35
       
35
       
+
       
      --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \

     

       
36
       
36
       
 
       
      --prefix JAVA_HOME : ${jdk.home} \

     

       
37
       
37
       
 
       
      --add-flags "--jdkhome ${jdk.home}"

     

       
38
       
38
       
 
       
      

     

···

       
23
       
23
       
 
       
    # Allow geeqie to find exiv2 and exiftran, necessary to

     

       
24
       
24
       
 
       
    # losslessly rotate JPEG images.

     

       
25
       
25
       
 
       
    sed -i $out/lib/geeqie/geeqie-rotate \

     

       
26
       
26
       
-
       
        -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'

     

       
26
       
26
       
+
       
        -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'

     

       
27
       
27
       
 
       
  '';

     

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       
  meta = with stdenv.lib; {

     

···

       
21
       
21
       
 
       
    mkdir -p $out/bin

     

       
22
       
22
       
 
       
   cp -r linux/work/* $out/${name}/

     

       
23
       
23
       
 
       
   makeWrapper $out/${name}/processing $out/bin/processing \

     

       
24
       
24
       
-
       
     --prefix PATH : "${jdk}/bin:${which}/bin" \

     

       
24
       
24
       
+
       
     --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \

     

       
25
       
25
       
 
       
     --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib

     

       
26
       
26
       
 
       
   makeWrapper $out/${name}/processing-java $out/bin/processing-java \

     

       
27
       
27
       
-
       
     --prefix PATH : "${jdk}/bin:${which}/bin" \

     

       
27
       
27
       
+
       
     --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \

     

       
28
       
28
       
 
       
     --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib

     

       
29
       
29
       
 
       
   ln -s ${jdk} $out/${name}/java

     

       
30
       
30
       
 
       
  '';

     

···

       
18
       
18
       
 
       
  '';

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  qmakeFlags = [

     

       
21
       
21
       
-
       
    "EXIV2PATH=${exiv2}/include/exiv2"

     

       
21
       
21
       
+
       
    "EXIV2PATH=${exiv2.dev}/include/exiv2"

     

       
22
       
22
       
 
       
    "OPENEXRDIR=${openexr}/include/OpenEXR"

     

       
23
       
23
       
 
       
    "FFTW3DIR=${fftwSinglePrec.dev}/include"

     

       
24
       
24
       
 
       
    "LIBTIFFDIR=${libtiff.dev}/include"

     

···

       
28
       
28
       
 
       
  patchPhase = ''

     

       
29
       
29
       
 
       
    ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}

     

       
30
       
30
       
 
       


     

       
31
       
31
       
-
       
    RPATH=${libusb}/lib

     

       
31
       
31
       
+
       
    RPATH=${libusb.out}/lib

     

       
32
       
32
       
 
       
    for a in usr/lib64/sane/*.so*; do

     

       
33
       
33
       
 
       
      if ! test -L $a; then

     

       
34
       
34
       
 
       
        patchelf --set-rpath $RPATH $a

     

···

       
55
       
55
       
 
       
      --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"

     

       
56
       
56
       
 
       


     

       
57
       
57
       
 
       
    substituteInPlace $out/lib/libsane.la \

     

       
58
       
58
       
-
       
      --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"

     

       
58
       
58
       
+
       
      --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg"

     

       
59
       
59
       
 
       
  '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);

     

       
60
       
60
       
 
       


     

       
61
       
61
       
 
       
  meta = with stdenv.lib; {

     

···

       
17
       
17
       
 
       
    ln -s $out/{nix-support,bin}/wavesurfer.tcl

     

       
18
       
18
       
 
       
    wrapProgram "$out/nix-support/wavesurfer.tcl"  \

     

       
19
       
19
       
 
       
                 --set TCLLIBPATH "${snack}/lib" \

     

       
20
       
20
       
-
       
                 --prefix PATH : "${tcl}/bin:${tk}/bin"

     

       
20
       
20
       
+
       
                 --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}"

     

       
21
       
21
       
 
       
  '';

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  meta = { 

     

···

       
23
       
23
       
 
       
    export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"

     

       
24
       
24
       
 
       
    # We need PATH from user env for xdg-open to find its tools, which

     

       
25
       
25
       
 
       
    # typically depend on the currently running desktop environment.

     

       
26
       
26
       
-
       
    export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH"

     

       
26
       
26
       
+
       
    export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"

     

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
    # avrdudess must have its resource files in its current working directory

     

       
29
       
29
       
 
       
    cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

     

···

       
1
       
1
       
-
       
{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew

     

       
2
       
2
       
-
       
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile

     

       
1
       
1
       
+
       
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew

     

       
2
       
2
       
+
       
, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile

     

       
3
       
3
       
 
       
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python

     

       
4
       
4
       
-
       
, zlib, fftw, opensubdiv

     

       
4
       
4
       
+
       
, zlib, fftw, opensubdiv, freetype

     

       
5
       
5
       
 
       
, jackaudioSupport ? false, libjack2

     

       
6
       
6
       
 
       
, cudaSupport ? false, cudatoolkit

     

       
7
       
7
       
 
       
, colladaSupport ? true, opencollada

     
···

       
18
       
18
       
 
       
  };

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  buildInputs =

     

       
21
       
21
       
-
       
    [ SDL boost cmake ffmpeg gettext glew ilmbase libXi

     

       
21
       
21
       
+
       
    [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype

     

       
22
       
22
       
 
       
      libjpeg libpng libsamplerate libsndfile libtiff mesa openal

     

       
23
       
23
       
-
       
      opencolorio openexr openimageio /* openjpeg */ python zlib fftw

     

       
23
       
23
       
+
       
      opencolorio openexr openimageio openjpeg python zlib fftw

     

       
24
       
24
       
 
       
      (opensubdiv.override { inherit cudaSupport; })

     

       
25
       
25
       
 
       
    ]

     

       
26
       
26
       
 
       
    ++ optional jackaudioSupport libjack2

     
···

       
41
       
41
       
 
       
      "-DWITH_SDL=ON"

     

       
42
       
42
       
 
       
      "-DWITH_GAMEENGINE=ON"

     

       
43
       
43
       
 
       
      "-DWITH_OPENCOLORIO=ON"

     

       
44
       
44
       
+
       
      "-DWITH_SYSTEM_OPENJPEG=ON"

     

       
44
       
45
       
 
       
      "-DWITH_PLAYER=ON"

     

       
45
       
46
       
 
       
      "-DWITH_OPENSUBDIV=ON"

     

       
46
       
47
       
 
       
      "-DPYTHON_LIBRARY=python${python.majorVersion}m"

     

       
47
       
48
       
 
       
      "-DPYTHON_LIBPATH=${python}/lib"

     

       
48
       
49
       
 
       
      "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"

     

       
49
       
50
       
 
       
      "-DPYTHON_VERSION=${python.majorVersion}"

     

       
51
       
51
       
+
       
      "-DWITH_PYTHON_INSTALL=OFF"

     

       
52
       
52
       
+
       
      "-DWITH_PYTHON_INSTALL_NUMPY=OFF"

     

       
50
       
53
       
 
       
    ]

     

       
51
       
54
       
 
       
    ++ optional jackaudioSupport "-DWITH_JACK=ON"

     

       
52
       
55
       
 
       
    ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"

     

···

       
42
       
42
       
 
       
    cp ding.png $out/share/pixmaps/

     

       
43
       
43
       
 
       
    cp ding.desktop $out/share/applications/

     

       
44
       
44
       
 
       


     

       
45
       
45
       
-
       
    wrapProgram $out/bin/ding --prefix PATH : ${gnugrep}/bin:${aspellEnv}/bin:${tk}/bin:${fortune}/bin --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""

     

       
45
       
45
       
+
       
    wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""

     

       
46
       
46
       
 
       
  '';

     

       
47
       
47
       
 
       


     

       
48
       
48
       
 
       
  meta = with stdenv.lib; {

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  pname = "emem";

     

       
5
       
5
       
-
       
  version = "0.2.26";

     

       
5
       
5
       
+
       
  version = "0.2.27";

     

       
6
       
6
       
 
       
  name = "${pname}-${version}";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
  inherit jdk;

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  src = fetchurl {

     

       
11
       
11
       
 
       
    url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";

     

       
12
       
12
       
-
       
    sha256 = "1qa3q2zgy20yq060b8gz5h7f5h8kbbk7rgfxvjbxllgd847qs4dy";

     

       
12
       
12
       
+
       
    sha256 = "0zmh152dfgsq2yj14wb3504pyibq4r671q5yz6yy28ihym7qr0fd";

     

       
13
       
13
       
 
       
  };

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  buildInputs = [ ];

     

···

       
41
       
41
       
 
       
    wrapProgram "$out/bin/finalterm" \

     

       
42
       
42
       
 
       
      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       
43
       
43
       
 
       
      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \

     

       
44
       
44
       
-
       
      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
44
       
44
       
+
       
      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
45
       
45
       
 
       
  '';

     

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
  meta = with lib; {

     

···

       
18
       
18
       
 
       
  installPhase = '' 

     

       
19
       
19
       
 
       
    mkdir -p $out/bin $out/share/man/man1

     

       
20
       
20
       
 
       
    cp get_iplayer $out/bin

     

       
21
       
21
       
-
       
    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB

     

       
21
       
21
       
+
       
    wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ ffmpeg flvstreamer vlc rtmpdump ]} --prefix PERL5LIB : $PERL5LIB

     

       
22
       
22
       
 
       
    cp get_iplayer.1 $out/share/man/man1

     

       
23
       
23
       
 
       
  '';

     

       
24
       
24
       
 
       
  

     

···

       
19
       
19
       
 
       
  dontStrip = true;

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  configurePhase = ''

     

       
22
       
22
       
-
       
    sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype}/include+' build.sh

     

       
22
       
22
       
+
       
    sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh

     

       
23
       
23
       
 
       
    sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh

     

       
24
       
24
       
 
       
    sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh

     

       
25
       
25
       
 
       
  '';

     

···

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  configureFlags = [

     

       
21
       
21
       
 
       
    "--with-libxml2=${libxml2}"

     

       
22
       
22
       
-
       
    "--with-libxslt=${libxslt}"

     

       
22
       
22
       
+
       
    "--with-libxslt=${libxslt.dev}"

     

       
23
       
23
       
 
       
  ];

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  meta = with stdenv.lib; { 

     

···

       
76
       
76
       
 
       
    substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""

     

       
77
       
77
       
 
       
    substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"

     

       
78
       
78
       
 
       


     

       
79
       
79
       
-
       
    substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses}/bin/tput\""

     

       
79
       
79
       
+
       
    substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\""

     

       
80
       
80
       
 
       
    substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""

     

       
81
       
81
       
 
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""

     

       
82
       
82
       
 
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "

     

       
83
       
83
       
 
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""

     

       
84
       
84
       
 
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""

     

       
85
       
85
       
-
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl}/bin/curl\""

     

       
85
       
85
       
+
       
    substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\""

     

       
86
       
86
       
 
       


     

       
87
       
87
       
 
       
    substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "

     

       
88
       
88
       
 
       


     

···

       
63
       
63
       
 
       
  ]);

     

       
64
       
64
       
 
       


     

       
65
       
65
       
 
       
  configurePhase = ''

     

       
66
       
66
       
-
       
    export BOOST_INCLUDEDIR=${boost}/include

     

       
66
       
66
       
+
       
    export BOOST_INCLUDEDIR=${boost.dev}/include

     

       
67
       
67
       
 
       
    export BOOST_LIBRARYDIR=${boost.out}/lib

     

       
68
       
68
       
 
       


     

       
69
       
69
       
 
       
    mkdir -p Build/Install

     

···

       
128
       
128
       
 
       


     

       
129
       
129
       
 
       
    patches = [

     

       
130
       
130
       
 
       
      ./patches/widevine.patch

     

       
131
       
131
       
+
       
      ./patches/glibc-2.24.patch

     

       
131
       
132
       
 
       
      (if versionOlder version "52.0.0.0"

     

       
132
       
133
       
 
       
       then ./patches/nix_plugin_paths_50.patch

     

       
133
       
134
       
 
       
       else ./patches/nix_plugin_paths_52.patch)

     

···

       
1
       
1
       
+
       
--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-03 21:02:37.000000000 +0200

     

       
2
       
2
       
+
       
+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp	2016-08-14 10:59:51.395354850 +0200

     

       
3
       
3
       
+
       
@@ -41,6 +41,11 @@

     

       
4
       
4
       
+
       
 #include <errno.h>

     

       
5
       
5
       
+
       
 #include <sys/mman.h>

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
+#if OS(LINUX) && defined(MADV_FREE)

     

       
8
       
8
       
+
       
+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime

     

       
9
       
9
       
+
       
+#undef MADV_FREE

     

       
10
       
10
       
+
       
+#endif

     

       
11
       
11
       
+
       
+

     

       
12
       
12
       
+
       
 #ifndef MADV_FREE

     

       
13
       
13
       
+
       
 #define MADV_FREE MADV_DONTNEED

     

       
14
       
14
       
+
       
 #endif

     

···

       
7
       
7
       
 
       
, trezor-bridge, bluejeans, djview4, adobe-reader

     

       
8
       
8
       
 
       
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/

     

       
9
       
9
       
 
       
, esteidfirefoxplugin

     

       
10
       
10
       
+
       
, vlc_npapi

     

       
10
       
11
       
 
       
}:

     

       
11
       
12
       
 
       


     

       
12
       
13
       
 
       
## configurability of the wrapper itself

     
···

       
45
       
46
       
 
       
      ++ lib.optional (cfg.enableBluejeans or false) bluejeans

     

       
46
       
47
       
 
       
      ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader

     

       
47
       
48
       
 
       
      ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin

     

       
49
       
49
       
+
       
      ++ lib.optional (cfg.enableVLC or false) vlc_npapi

     

       
48
       
50
       
 
       
     );

     

       
49
       
51
       
 
       
  libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])

     

       
50
       
52
       
 
       
         ++ lib.optionals (cfg.enableQuakeLive or false)

     

···

       
41
       
41
       
 
       
  '';

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
  postInstall = ''

     

       
44
       
44
       
-
       
    mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath

     

       
45
       
45
       
-
       
    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser

     

       
46
       
46
       
-
       


     

       
47
       
44
       
 
       
    install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"

     

       
48
       
45
       
 
       
    install -Dm644 qutebrowser.desktop \

     

       
49
       
46
       
 
       
        "$out/share/applications/qutebrowser.desktop"

     
···

       
54
       
51
       
 
       
    install -Dm644 icons/qutebrowser.svg \

     

       
55
       
52
       
 
       
        "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"

     

       
56
       
53
       
 
       
    install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*

     

       
54
       
54
       
+
       
  '';

     

       
55
       
55
       
+
       


     

       
56
       
56
       
+
       
  postFixup = ''

     

       
57
       
57
       
+
       
    wrapPythonPrograms

     

       
58
       
58
       
+
       
    mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath

     

       
59
       
59
       
+
       
    makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser

     

       
60
       
60
       
+
       


     

       
61
       
61
       
+
       
    sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped

     

       
57
       
62
       
 
       
  '';

     

       
58
       
63
       
 
       


     

       
59
       
64
       
 
       
  meta = {

     

···

       
24
       
24
       
 
       
    mv * $out

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
    for n in $out/{bin,sbin}"/"*; do

     

       
27
       
27
       
-
       
      wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"

     

       
27
       
27
       
+
       
      wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"

     

       
28
       
28
       
 
       
    done

     

       
29
       
29
       
 
       
  '';

     

       
30
       
30
       
 
       


     

···

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  preFixup = ''

     

       
40
       
40
       
 
       
    wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"

     

       
41
       
41
       
-
       
    wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin:${procps-ng}/bin"

     

       
41
       
41
       
+
       
    wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}"

     

       
42
       
42
       
 
       
    chmod +x "$out/libexec/kubernetes/safe_format_and_mount"

     

       
43
       
43
       
-
       
    wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${e2fsprogs}/bin:${utillinux}/bin"

     

       
43
       
43
       
+
       
    wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}"

     

       
44
       
44
       
 
       
    substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \

     

       
45
       
45
       
 
       
      --replace KUBE_OUTPUT_HOSTBIN KUBE_BIN

     

       
46
       
46
       
 
       
  '';

     

···

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
    for n in $out/{bin,sbin}"/"*; do

     

       
23
       
23
       
 
       
      wrapProgram $n \

     

       
24
       
24
       
-
       
        --prefix PATH : "${jre}/bin:${bash}/bin" \

     

       
24
       
24
       
+
       
        --prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \

     

       
25
       
25
       
 
       
        --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}"

     

       
26
       
26
       
 
       
    done

     

       
27
       
27
       
 
       
  '';

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
buildGoPackage rec {

     

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

     

       
5
       
5
       
-
       
  version = "0.7.0";

     

       
5
       
5
       
+
       
  version = "0.7.1";

     

       
6
       
6
       
 
       
  rev = "v${version}";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
  goPackagePath = "github.com/hashicorp/terraform";

     
···

       
11
       
11
       
 
       
    inherit rev;

     

       
12
       
12
       
 
       
    owner = "hashicorp";

     

       
13
       
13
       
 
       
    repo = "terraform";

     

       
14
       
14
       
-
       
    sha256 = "0k5d6zph6sq1qg8vi5jmk7apy6v67xn5i7rqjamyr5an7lpxssc9";

     

       
14
       
14
       
+
       
    sha256 = "1nvz4nqkn8pl25zyw7x5079dbzmwdxsar9gbcjk1srfpa746j1y4";

     

       
15
       
15
       
 
       
  };

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  postInstall = ''

     
···

       
22
       
22
       
 
       
      fi

     

       
23
       
23
       
 
       
    done

     

       
24
       
24
       
 
       
  '';

     

       
25
       
25
       
+
       


     

       
26
       
26
       
+
       
  meta = with stdenv.lib; {

     

       
27
       
27
       
+
       
    description = "Tool for building, changing, and versioning infrastructure";

     

       
28
       
28
       
+
       
    homepage = "https://www.terraform.io/";

     

       
29
       
29
       
+
       
    license = licenses.mpl20;

     

       
30
       
30
       
+
       
  };

     

       
25
       
31
       
 
       
}

     

···

       
20
       
20
       
 
       
  installPhase = ''

     

       
21
       
21
       
 
       
  mkdir -p $out/bin

     

       
22
       
22
       
 
       
  cp ./* $out/bin/ -R

     

       
23
       
23
       
-
       
  wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib

     

       
23
       
23
       
+
       
  wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}

     

       
24
       
24
       
 
       
   '';

     

       
25
       
25
       
 
       
}

     

···

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  postInstall = ''

     

       
18
       
18
       
 
       
    sed <"frontends/snipe" >"$out/bin/snipe" \

     

       
19
       
19
       
-
       
      -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\""

     

       
19
       
19
       
+
       
      -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""

     

       
20
       
20
       
 
       
    chmod 555 "$out/bin/snipe"

     

       
21
       
21
       
 
       
  '';

     

       
22
       
22
       
 
       


     

···

       
33
       
33
       
 
       
  installPhase = ''

     

       
34
       
34
       
 
       
    make install

     

       
35
       
35
       
 
       
    for file in "$out"/bin/* "$out"/sbin/*; do

     

       
36
       
36
       
-
       
        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"

     

       
36
       
36
       
+
       
        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.glibc libedit qt4 ]}"

     

       
37
       
37
       
 
       
    done

     

       
38
       
38
       
 
       
  '';

     

       
39
       
39
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  version = "4.0.1641";

     

       
7
       
7
       
+
       
  version = "4.26.0.1655";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  rpath = stdenv.lib.makeLibraryPath [

     

       
10
       
10
       
 
       
    xdg_utils

     
···

       
43
       
43
       
 
       
    if stdenv.system == "x86_64-linux" then

     

       
44
       
44
       
 
       
      fetchurl {

     

       
45
       
45
       
 
       
        url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";

     

       
46
       
46
       
-
       
        sha256 = "15xy89qmldp1zs3f809b8sayvawc7sz24l0718iib83g5jzvivsm";

     

       
46
       
46
       
+
       
        sha256 = "1y484cp77kz984z9zdsy6c4669fmwv2knc287c1v24s81p5pqygg";

     

       
47
       
47
       
 
       
      }

     

       
48
       
48
       
 
       
    else

     

       
49
       
49
       
 
       
      throw "HipChat is not supported on ${stdenv.system}";

     

···

       
56
       
56
       
 
       
    chmod +x $out/bin/jitsi

     

       
57
       
57
       
 
       
    substituteInPlace $out/bin/jitsi \

     

       
58
       
58
       
 
       
        --subst-var-by JAVA ${jdk}/bin/java \

     

       
59
       
59
       
-
       
        --subst-var-by EXTRALIBS ${gtk2}/lib

     

       
59
       
59
       
+
       
        --subst-var-by EXTRALIBS ${gtk2.out}/lib

     

       
60
       
60
       
 
       
    patchShebangs $out

     

       
61
       
61
       
 
       


     

       
62
       
62
       
 
       
    libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"

     

···

       
19
       
19
       
 
       
  '';

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  passthru = {

     

       
22
       
22
       
-
       
    wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin";

     

       
22
       
22
       
+
       
    wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}";

     

       
23
       
23
       
 
       
  };

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  meta = with stdenv.lib; {

     

···

       
77
       
77
       
 
       
    # gtk3 programs have the runtime dependency on XDG_DATA_DIRS

     

       
78
       
78
       
 
       
    preFixup = ''

     

       
79
       
79
       
 
       
      for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do

     

       
80
       
80
       
-
       
        wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH"

     

       
80
       
80
       
+
       
        wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH"

     

       
81
       
81
       
 
       
      done

     

       
82
       
82
       
 
       
    '';

     

       
83
       
83
       
 
       


     

···

       
80
       
80
       
 
       
    wrapProgram $out/opt/viber/Viber \

     

       
81
       
81
       
 
       
      --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \

     

       
82
       
82
       
 
       
      --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \

     

       
83
       
83
       
-
       
      --set QTCOMPOSE "${xorg.libX11}/share/X11/locale"

     

       
83
       
83
       
+
       
      --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"

     

       
84
       
84
       
 
       
    ln -s $out/opt/viber/Viber $out/bin/viber

     

       
85
       
85
       
 
       


     

       
86
       
86
       
 
       
    mv $out/usr/share $out/share

     

···

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  postInstall = ''

     

       
23
       
23
       
 
       
    wrapProgram $out/bin/mailpile \

     

       
24
       
24
       
-
       
      --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"

     

       
24
       
24
       
+
       
      --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"

     

       
25
       
25
       
 
       
  '';

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  meta = with stdenv.lib; {

     

···

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

     

       
34
       
34
       
 
       
        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       
35
       
35
       
 
       
        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \

     

       
36
       
36
       
-
       
        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
36
       
36
       
+
       
        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       
37
       
37
       
 
       
    done

     

       
38
       
38
       
 
       
  '';

     

       
39
       
39
       
 
       


     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       
  freenet_ext = fetchurl {

     
···

       
6
       
6
       
 
       
    sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";

     

       
7
       
7
       
 
       
  };

     

       
8
       
8
       
 
       


     

       
9
       
9
       
+
       
  bcprov_version = "jdk15on-154";

     

       
9
       
10
       
 
       
  bcprov = fetchurl {

     

       
10
       
10
       
-
       
    url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar;

     

       
11
       
11
       
-
       
    sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d";

     

       
11
       
11
       
+
       
    url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar";

     

       
12
       
12
       
+
       
    sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk";

     

       
12
       
13
       
 
       
  };

     

       
13
       
14
       
 
       
  seednodes = fetchurl {

     

       
14
       
15
       
 
       
    url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref;

     

       
15
       
15
       
-
       
    sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";

     

       
16
       
16
       
+
       
    sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";

     

       
16
       
17
       
 
       
  };

     

       
17
       
17
       
-
       
  version = "build01470";

     

       
18
       
18
       
+
       
  version = "build01475";

     

       
18
       
19
       
 
       


     

       
19
       
20
       
 
       
  freenet-jars = stdenv.mkDerivation {

     

       
20
       
21
       
 
       
    name = "freenet-jars-${version}";

     

       
21
       
22
       
 
       


     

       
22
       
22
       
-
       
    src = fetchgit {

     

       
23
       
23
       
-
       
      url = https://github.com/freenet/fred;

     

       
24
       
24
       
-
       
      rev = "refs/tags/${version}";

     

       
25
       
25
       
-
       
      sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";

     

       
23
       
23
       
+
       
    src = fetchFromGitHub {

     

       
24
       
24
       
+
       
      owner = "freenet";

     

       
25
       
25
       
+
       
      repo = "fred";

     

       
26
       
26
       
+
       
      rev = version;

     

       
27
       
27
       
+
       
      sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08";

     

       
26
       
28
       
 
       
    };

     

       
27
       
29
       
 
       


     

       
28
       
30
       
 
       
    patchPhase = ''

     

       
29
       
31
       
 
       
      cp ${freenet_ext} lib/freenet/freenet-ext.jar

     

       
30
       
30
       
-
       
      cp ${bcprov} lib/bcprov-jdk15on-152.jar

     

       
32
       
32
       
+
       
      cp ${bcprov} lib/bcprov-${bcprov_version}.jar

     

       
31
       
33
       
 
       


     

       
32
       
34
       
 
       
      sed '/antcall.*-ext/d' -i build.xml

     

       
33
       
35
       
 
       
      sed 's/@unknown@/${version}/g' -i build-clean.xml

     
···

       
39
       
41
       
 
       


     

       
40
       
42
       
 
       
    installPhase = ''

     

       
41
       
43
       
 
       
      mkdir -p $out/share/freenet

     

       
42
       
42
       
-
       
      cp lib/bcprov-jdk15on-152.jar $out/share/freenet

     

       
44
       
44
       
+
       
      cp lib/bcprov-${bcprov_version}.jar $out/share/freenet

     

       
43
       
45
       
 
       
      cp lib/freenet/freenet-ext.jar $out/share/freenet

     

       
44
       
46
       
 
       
      cp dist/freenet.jar $out/share/freenet

     

       
45
       
47
       
 
       
    '';

     
···

       
51
       
53
       
 
       


     

       
52
       
54
       
 
       
  src = substituteAll {

     

       
53
       
55
       
 
       
    src = ./freenetWrapper;

     

       
54
       
54
       
-
       
    inherit bash coreutils seednodes;

     

       
56
       
56
       
+
       
    inherit bash coreutils seednodes bcprov_version;

     

       
55
       
57
       
 
       
    freenet = freenet-jars;

     

       
56
       
58
       
 
       
    jre = jdk.jre;

     

       
57
       
59
       
 
       
  };

     

···

       
15
       
15
       
 
       
chmod u+rw $FREENET_HOME/seednodes.fref

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
cd $FREENET_HOME

     

       
18
       
18
       
-
       
@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter

     

       
18
       
18
       
+
       
@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter

     

···

       
135
       
135
       
 
       


     

       
136
       
136
       
 
       
    makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \

     

       
137
       
137
       
 
       
      --set ICAROOT "$ICAInstDir" \

     

       
138
       
138
       
-
       
      --set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \

     

       
138
       
138
       
+
       
      --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \

     

       
139
       
139
       
 
       
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       
140
       
140
       
 
       
      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \

     

       
141
       
141
       
 
       
      --set LD_LIBRARY_PATH "$libPath" \

     

···

       
25
       
25
       
 
       
    make install

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
    wrapProgram $out/bin/seafile-applet \

     

       
28
       
28
       
-
       
      --suffix PATH : ${ccnet}/bin:${seafile-shared}/bin

     

       
28
       
28
       
+
       
      --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}

     

       
29
       
29
       
 
       
    '';

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
  meta =

     

···

       
31
       
31
       
 
       
  postInstall = ''

     

       
32
       
32
       
 
       
    for i in $out/bin/*; do

     

       
33
       
33
       
 
       
      wrapProgram $i \

     

       
34
       
34
       
-
       
        --prefix PATH ':' "${pstoedit}/bin" \

     

       
34
       
34
       
+
       
        --prefix PATH ':' "${pstoedit.out}/bin" \

     

       
35
       
35
       
 
       
        --prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"

     

       
36
       
36
       
 
       
    done

     

       
37
       
37
       
 
       
  '';

     

···

       
72
       
72
       
 
       
        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \

     

       
73
       
73
       
 
       
        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \

     

       
74
       
74
       
 
       
        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"  \

     

       
75
       
75
       
-
       
        --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"

     

       
75
       
75
       
+
       
        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"

     

       
76
       
76
       
 
       
    done

     

       
77
       
77
       
 
       


     

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

     

···

       
45
       
45
       
 
       
        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \

     

       
46
       
46
       
 
       
        --prefix PERL5LIB ":" "$PERL5LIB"                               \

     

       
47
       
47
       
 
       
        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \

     

       
48
       
48
       
-
       
        --prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"

     

       
48
       
48
       
+
       
        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"

     

       
49
       
49
       
 
       
    done

     

       
50
       
50
       
 
       


     

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

     

       
52
       
52
       
 
       
  '';

     

       
53
       
53
       
 
       


     

       
54
       
54
       
 
       
  # The following settings fix failures in the test suite. It's not required otherwise.

     

       
55
       
55
       
-
       
  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";

     

       
55
       
55
       
+
       
  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";

     

       
56
       
56
       
 
       
  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";

     

       
57
       
57
       
 
       


     

       
58
       
58
       
 
       
  doCheck = false;      # https://github.com/NixOS/nixpkgs/issues/11084

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip

     

       
2
       
2
       
 
       
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd

     

       
3
       
3
       
 
       
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon

     

       
4
       
4
       
 
       
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which

     
···

       
247
       
247
       
 
       
      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer

     

       
248
       
248
       
 
       
      gst_all_1.gst-plugins-base gsettings_desktop_schemas glib

     

       
249
       
249
       
 
       
      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler

     

       
250
       
250
       
-
       
      python3 sablotron sane-backends tcsh unzip vigra which zip zlib

     

       
250
       
250
       
+
       
      python3 sablotron sane-backends unzip vigra which zip zlib

     

       
251
       
251
       
 
       
      mdds bluez5 glibc libcmis libwps libabw

     

       
252
       
252
       
 
       
      libxshmfence libatomic_ops graphite2 harfbuzz

     

       
253
       
253
       
 
       
      librevenge libe-book libmwaw glm glew ncurses

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip

     

       
1
       
1
       
+
       
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip

     

       
2
       
2
       
 
       
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd

     

       
3
       
3
       
 
       
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon

     

       
4
       
4
       
 
       
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which

     
···

       
241
       
241
       
 
       
      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer

     

       
242
       
242
       
 
       
      gst_all_1.gst-plugins-base gsettings_desktop_schemas glib

     

       
243
       
243
       
 
       
      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler

     

       
244
       
244
       
-
       
      python3 sablotron sane-backends tcsh unzip vigra which zip zlib

     

       
244
       
244
       
+
       
      python3 sablotron sane-backends unzip vigra which zip zlib

     

       
245
       
245
       
 
       
      mdds bluez5 glibc libcmis libwps libabw

     

       
246
       
246
       
 
       
      libxshmfence libatomic_ops graphite2 harfbuzz

     

       
247
       
247
       
 
       
      librevenge libe-book libmwaw glm glew ncurses

     

···

       
41
       
41
       
 
       
    mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"

     

       
42
       
42
       
 
       
    cp bin/satallax.opt "$out/bin/satallax"

     

       
43
       
43
       
 
       
    wrapProgram "$out/bin/satallax" \

     

       
44
       
44
       
-
       
      --suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \

     

       
44
       
44
       
+
       
      --suffix PATH : "${stdenv.lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \

     

       
45
       
45
       
 
       
      --add-flags "-M" --add-flags "$out/lib/satallax/modes"

     

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
    cp LICENSE README "$out/share/doc/satallax"

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre

     

       
2
       
2
       
-
       
, SDL_image, glew, mesa, boost, glm

     

       
2
       
2
       
+
       
, SDL_image, freetype, glew, mesa, boost, glm

     

       
3
       
3
       
 
       
}:

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     
···

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  buildInputs = [

     

       
15
       
15
       
 
       
    glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa

     

       
16
       
16
       
-
       
    boost glm

     

       
16
       
16
       
+
       
    boost glm freetype

     

       
17
       
17
       
 
       
  ];

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];

     

···

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  postInstall = ''

     

       
19
       
19
       
 
       
    for f in $out/bin/*; do #*/

     

       
20
       
20
       
-
       
      wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"

     

       
20
       
20
       
+
       
      wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"

     

       
21
       
21
       
 
       
    done

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
    rm -r screenkey/.bzr

     

···

       
20
       
20
       
 
       
  postInstall = ''

     

       
21
       
21
       
 
       
    mkdir -p $out/share/shotcut

     

       
22
       
22
       
 
       
    cp -r src/qml $out/share/shotcut/

     

       
23
       
23
       
-
       
    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib

     

       
23
       
23
       
+
       
    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]}

     

       
24
       
24
       
 
       
  '';

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  meta = with stdenv.lib; {

     

···

       
1
       
1
       
+
       
{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk,

     

       
2
       
2
       
+
       
libxcb, xlibsWrapper, gtk}:

     

       
3
       
3
       
+
       


     

       
4
       
4
       
+
       
with stdenv.lib;

     

       
5
       
5
       
+
       


     

       
6
       
6
       
+
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
+
       
  name = "vlc-plugin-${version}";

     

       
8
       
8
       
+
       
  version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4

     

       
9
       
9
       
+
       


     

       
10
       
10
       
+
       
  src = fetchgit {

     

       
11
       
11
       
+
       
    url = "https://code.videolan.org/videolan/npapi-vlc.git";

     

       
12
       
12
       
+
       
    rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";

     

       
13
       
13
       
+
       
    sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd";

     

       
14
       
14
       
+
       
  };

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  preConfigure = "sh autogen.sh";

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
  buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb

     

       
19
       
19
       
+
       
      xlibsWrapper gtk ];

     

       
20
       
20
       
+
       


     

       
21
       
21
       
+
       
  enableParallelBuilding = true;

     

       
22
       
22
       
+
       


     

       
23
       
23
       
+
       
  passthru = {

     

       
24
       
24
       
+
       
    mozillaPlugin = "/lib/mozilla/plugins";

     

       
25
       
25
       
+
       
  };

     

       
26
       
26
       
+
       


     

       
27
       
27
       
+
       
  meta = with stdenv.lib; {

     

       
28
       
28
       
+
       
    description = "Webplugins based on libVLC (for firefox, npapi)";

     

       
29
       
29
       
+
       
    homepage = https://code.videolan.org/videolan/npapi-vlc;

     

       
30
       
30
       
+
       
    platforms = platforms.linux;

     

       
31
       
31
       
+
       
    license = licenses.gpl2Plus;

     

       
32
       
32
       
+
       
  };

     

       
33
       
33
       
+
       
}

     

···

       
47
       
47
       
 
       
    install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker

     

       
48
       
48
       
 
       
    install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit

     

       
49
       
49
       
 
       
    makeWrapper $out/libexec/docker/docker $out/bin/docker \

     

       
50
       
50
       
-
       
      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin"

     

       
50
       
50
       
+
       
      --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}"

     

       
51
       
51
       
 
       


     

       
52
       
52
       
 
       
    # systemd

     

       
53
       
53
       
 
       
    install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

     

···

       
20
       
20
       
 
       
    cp docker-gc $out/bin

     

       
21
       
21
       
 
       
    chmod +x $out/bin/docker-gc

     

       
22
       
22
       
 
       
    wrapProgram $out/bin/docker-gc \

     

       
23
       
23
       
-
       
        --prefix PATH : "${docker}/bin:${coreutils}/bin:${procps}/bin:${gnused}/bin:${findutils}/bin:${gnugrep}/bin"

     

       
23
       
23
       
+
       
        --prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}"

     

       
24
       
24
       
 
       
  '';

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  meta = {

     

···

       
36
       
36
       
 
       
  postInstall = ''

     

       
37
       
37
       
 
       
	sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"

     

       
38
       
38
       
 
       
	wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \

     

       
39
       
39
       
-
       
		--prefix PATH ':' "${iproute}/bin" \

     

       
40
       
40
       
-
       
		--prefix PATH ':' "${dbus}/bin" \

     

       
41
       
41
       
-
       
		--prefix PATH ':' "${systemd}/bin"

     

       
39
       
39
       
+
       
		--prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}"

     

       
42
       
40
       
 
       
  '';

     

       
43
       
41
       
 
       


     

       
44
       
42
       
 
       
  meta = with stdenv.lib; {

     

···

       
77
       
77
       
 
       


     

       
78
       
78
       
 
       
    for i in lib/VBoxOGL*.so

     

       
79
       
79
       
 
       
    do

     

       
80
       
80
       
-
       
        patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i

     

       
80
       
80
       
+
       
        patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i

     

       
81
       
81
       
 
       
    done

     

       
82
       
82
       
 
       


     

       
83
       
83
       
 
       
    # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions

     

···

       
143
       
143
       
 
       
      touch tools/include/gnu/stubs-32.h

     

       
144
       
144
       
 
       
    '';

     

       
145
       
145
       
 
       


     

       
146
       
146
       
+
       
  # Fix build on Glibc 2.24.

     

       
147
       
147
       
+
       
  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       
148
       
148
       
+
       


     

       
146
       
149
       
 
       
  # TODO: Flask needs more testing before enabling it by default.

     

       
147
       
150
       
 
       
  #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";

     

       
148
       
151
       
 
       
  makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";

     

···

       
74
       
74
       
 
       
      --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \

     

       
75
       
75
       
 
       
      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       
76
       
76
       
 
       
      --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \

     

       
77
       
77
       
-
       
      --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"

     

       
77
       
77
       
+
       
      --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"

     

       
78
       
78
       
 
       


     

       
79
       
79
       
 
       
    wrapProgram $out/bin/awesome-client \

     

       
80
       
80
       
 
       
      --prefix PATH : "${which}/bin"

     

···

       
4
       
4
       
 
       
  libXrandr, libXrender, xwininfo }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation {

     

       
7
       
7
       
-
       
  name = "compton-git-2015-09-21";

     

       
7
       
7
       
+
       
  name = "compton-git-2016-08-10";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchFromGitHub {

     

       
10
       
10
       
 
       
    owner  = "chjj";

     

       
11
       
11
       
 
       
    repo   = "compton";

     

       
12
       
12
       
-
       
    rev    = "2343e4bbd298b35ea5c190c52abd2b0cb9f79a18";

     

       
13
       
13
       
-
       
    sha256 = "1pb0ic47sfd796crwk47cya2ahbxsm6ygi6sh4fwd734kwz37h4z";

     

       
12
       
12
       
+
       
    rev    = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a";

     

       
13
       
13
       
+
       
    sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  nativeBuildInputs = [

     

···

       
74
       
74
       
 
       
    cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/

     

       
75
       
75
       
 
       
    chmod +x $out/bin/stumpish

     

       
76
       
76
       
 
       
    wrapProgram $out/bin/stumpish \

     

       
77
       
77
       
-
       
      --prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin"

     

       
77
       
77
       
+
       
      --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"

     

       
78
       
78
       
 
       


     

       
79
       
79
       
 
       
    # Paths in the compressed image $out/bin/stumpwm are not

     

       
80
       
80
       
 
       
    # recognized by Nix. Add explicit reference here.