commit 74a3a2cd7e409062ad3efa61e84d366a8f67c853 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/gitlab.nix

···

       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 \

+1 -1

nixos/modules/virtualisation/brightbox-image.nix

···

       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

+1 -1

nixos/modules/virtualisation/google-compute-image.nix

···

       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

+1 -1

nixos/tests/virtualbox.nix

···

       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="${stdenv.lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"

     

       13
       13
        
       

     

       14
       14
        
             mkdir -p /var/run/dbus

     

       15
       15
        
             cat > /etc/passwd <<EOF

+1 -1

pkgs/applications/audio/caudec/default.nix

···

       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

pkgs/applications/editors/netbeans/default.nix

···

       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

+1 -1

pkgs/applications/graphics/geeqie/default.nix

···

       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; {

+2 -2

pkgs/applications/graphics/processing/default.nix

···

       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
        
         '';

+1 -1

pkgs/applications/misc/audio/wavesurfer/default.nix

···

       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 = {

+1 -1

pkgs/applications/misc/avrdudess/default.nix

···

       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

pkgs/applications/misc/ding/default.nix

···

       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; {

+1 -1

pkgs/applications/misc/get_iplayer/default.nix

···

       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

+1 -1

pkgs/applications/networking/cluster/hadoop/default.nix

···

       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

+2 -2

pkgs/applications/networking/cluster/kubernetes/default.nix

···

       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
        
         '';

+1 -1

pkgs/applications/networking/cluster/pig/default.nix

···

       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
        
         '';

+1 -1

pkgs/applications/networking/esniper/default.nix

···

       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

+1 -1

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix

···

       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; {

+1 -1

pkgs/applications/networking/mailreaders/mailpile/default.nix

···

       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; {

+1 -1

pkgs/applications/networking/seafile-client/default.nix

···

       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 =

+1 -1

pkgs/applications/office/gnucash/2.6.nix

···

       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

+1 -1

pkgs/applications/office/gnucash/default.nix

···

       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

+1 -1

pkgs/applications/video/mkcast/default.nix

···

       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

+1 -1

pkgs/applications/virtualization/docker/gc.nix

···

       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 = {

+1 -1

pkgs/applications/window-managers/stumpwm/default.nix

···

       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.

+1 -1

pkgs/build-support/vm/default.nix

···

       587
       587
        
             buildCommand = ''

     

       588
       588
        
               ${createRootFS}

     

       589
       589
        
       

     

       590
       590
       -
               PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin

     

       590
       590
       +
               PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]}

     

       591
       591
        
       

     

       592
       592
        
               # Unpack the .debs.  We do this to prevent pre-install scripts

     

       593
       593
        
               # (which have lots of circular dependencies) from barfing.

+1 -1

pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix

···

       28
       28
        
               wrapProgram "$prog" \

     

       29
       29
        
                   --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       30
       30
        
                   --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       31
       31
       -
                   --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin"

     

       31
       31
       +
                   --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"

     

       32
       32
        
           done

     

       33
       33
        
         '';

     

       34
       34

+1 -1

pkgs/development/compilers/ghc/7.10.2.nix

···

       60
       60
        
           for i in "$out/bin/"*; do

     

       61
       61
        
             test ! -h $i || continue

     

       62
       62
        
             egrep --quiet '^#!' <(head -n 1 $i) || continue

     

       63
       63
       -
             sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i

     

       63
       63
       +
             sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i

     

       64
       64
        
           done

     

       65
       65
        
         '';

     

       66
       66

+1 -1

pkgs/development/compilers/ghc/7.10.3.nix

···

       61
       61
        
           for i in "$out/bin/"*; do

     

       62
       62
        
             test ! -h $i || continue

     

       63
       63
        
             egrep --quiet '^#!' <(head -n 1 $i) || continue

     

       64
       64
       -
             sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i

     

       64
       64
       +
             sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i

     

       65
       65
        
           done

     

       66
       66
        
         '';

     

       67
       67

+1 -1

pkgs/development/compilers/ghc/8.0.1.nix

···

       64
       64
        
           for i in "$out/bin/"*; do

     

       65
       65
        
             test ! -h $i || continue

     

       66
       66
        
             egrep --quiet '^#!' <(head -n 1 $i) || continue

     

       67
       67
       -
             sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i

     

       67
       67
       +
             sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i

     

       68
       68
        
           done

     

       69
       69
        
         '';

     

       70
       70

+1 -1

pkgs/development/compilers/ghc/head.nix

···

       61
       61
        
           for i in "$out/bin/"*; do

     

       62
       62
        
             test ! -h $i || continue

     

       63
       63
        
             egrep --quiet '^#!' <(head -n 1 $i) || continue

     

       64
       64
       -
             sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i

     

       64
       64
       +
             sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i

     

       65
       65
        
           done

     

       66
       66
        
         '';

     

       67
       67

+1 -1

pkgs/development/compilers/microscheme/default.nix

···

       16
       16
        
           make install PREFIX=$out

     

       17
       17
        
       

     

       18
       18
        
           wrapProgram $out/bin/microscheme \

     

       19
       19
       -
             --prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin"

     

       19
       19
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}"

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/compilers/squeak/default.nix

···

       17
       17
        
         postPatch = ''

     

       18
       18
        
           for i in squeak.in squeak.sh.in; do

     

       19
       19
        
             substituteInPlace unix/cmake/$i --replace "PATH=" \

     

       20
       20
       -
               "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"

     

       20
       20
       +
               "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"

     

       21
       21
        
           done

     

       22
       22
        
         '';

     

       23
       23

+1 -1

pkgs/development/interpreters/elixir/default.nix

···

       44
       44
        
            b=$(basename $f)

     

       45
       45
        
             if [ $b == "mix" ]; then continue; fi

     

       46
       46
        
             wrapProgram $f \

     

       47
       47
       -
               --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \

     

       47
       47
       +
               --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \

     

       48
       48
        
               --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt

     

       49
       49
        
           done

     

       50
       50

+1 -1

pkgs/development/interpreters/erlang/R16.nix

···

       52
       52
        
         # Some erlang bin/ scripts run sed and awk

     

       53
       53
        
         postFixup = ''

     

       54
       54
        
           wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"

     

       55
       55
       -
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"

     

       55
       55
       +
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"

     

       56
       56
        
         '';

     

       57
       57
        
       

     

       58
       58
        
         setupHook = ./setup-hook.sh;

+1 -1

pkgs/development/interpreters/erlang/R17.nix

···

       69
       69
        
         # Some erlang bin/ scripts run sed and awk

     

       70
       70
        
         postFixup = ''

     

       71
       71
        
           wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"

     

       72
       72
       -
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"

     

       72
       72
       +
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"

     

       73
       73
        
         '';

     

       74
       74
        
       

     

       75
       75
        
         setupHook = ./setup-hook.sh;

+1 -1

pkgs/development/interpreters/erlang/R18.nix

···

       80
       80
        
         # Some erlang bin/ scripts run sed and awk

     

       81
       81
        
         postFixup = ''

     

       82
       82
        
           wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"

     

       83
       83
       -
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"

     

       83
       83
       +
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"

     

       84
       84
        
         '';

     

       85
       85
        
       

     

       86
       86
        
         setupHook = ./setup-hook.sh;

+1 -1

pkgs/development/interpreters/erlang/R19.nix

···

       74
       74
        
         # Some erlang bin/ scripts run sed and awk

     

       75
       75
        
         postFixup = ''

     

       76
       76
        
           wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"

     

       77
       77
       -
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"

     

       77
       77
       +
           wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"

     

       78
       78
        
         '';

     

       79
       79
        
       

     

       80
       80
        
         setupHook = ./setup-hook.sh;

+1 -1

pkgs/development/interpreters/lfe/default.nix

···

       39
       39
        
           # Add some stuff to PATH so the scripts can run without problems.

     

       40
       40
        
           for f in $out/bin/*; do

     

       41
       41
        
             wrapProgram $f \

     

       42
       42
       -
               --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin"

     

       42
       42
       +
               --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin"

     

       43
       43
        
             substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"

     

       44
       44
        
           done

     

       45
       45
        
         '';

+1 -1

pkgs/development/mobile/androidenv/androidsdk.nix

···

       83
       83
        
               for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service

     

       84
       84
        
               do

     

       85
       85
        
                   wrapProgram `pwd`/$i \

     

       86
       86
       -
                     --prefix PATH : ${file}/bin:${glxinfo}/bin \

     

       86
       86
       +
                     --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \

     

       87
       87
        
                     --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \

     

       88
       88
        
                     --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb

     

       89
       89
        
               done

+1 -1

pkgs/development/tools/build-managers/leiningen/builder.sh

···

       18
       18
        
       patchShebangs $out

     

       19
       19
        
       

     

       20
       20
        
       wrapProgram $out_bin \

     

       21
       21
       -
           --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \

     

       21
       21
       +
           --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils findutils ]}" \

     

       22
       22
        
           --set LEIN_GPG ${gnupg1compat}/bin/gpg \

     

       23
       23
        
           --set JAVA_CMD ${jdk}/bin/java

+1 -1

pkgs/development/tools/continuous-integration/buildkite-agent/default.nix

···

       23
       23
        
           substituteInPlace $out/share/bootstrap.sh \

     

       24
       24
        
             --replace "#!/bin/bash" "#!$(type -P bash)"

     

       25
       25
        
           wrapProgram $out/bin/buildkite-agent \

     

       26
       26
       -
             --set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'

     

       26
       26
       +
             --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"'

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         meta = {

+1 -1

pkgs/development/tools/continuous-integration/cide/default.nix

···

       19
       19
        
         installPhase = ''

     

       20
       20
        
           mkdir -p $out/bin

     

       21
       21
        
           makeWrapper ${env}/bin/cide $out/bin/cide \

     

       22
       22
       -
             --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin

     

       22
       22
       +
             --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
        
         meta = with lib; {

+1 -1

pkgs/development/tools/haskell/ihaskell/wrapper.nix

···

       9
       9
        
         ihaskellSh = writeScriptBin "ihaskell-notebook" ''

     

       10
       10
        
           #! ${stdenv.shell}

     

       11
       11
        
           export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"

     

       12
       12
       -
           export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"

     

       12
       12
       +
           export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"

     

       13
       13
        
           ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell

     

       14
       14
        
         '';

     

       15
       15
        
         profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";

+1 -1

pkgs/development/tools/misc/autobuild/default.nix

···

       14
       14
        
       

     

       15
       15
        
         postInstall = ''

     

       16
       16
        
           wrapProgram $out/bin/ab{put,build}-sourceforge \

     

       17
       17
       -
             --prefix PATH ":" "${openssh}/bin:${rsync}/bin"

     

       17
       17
       +
             --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}"

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
        
         meta = {

+1 -1

pkgs/development/tools/misc/drush/default.nix

···

       32
       32
        
           mkdir -p "$out"

     

       33
       33
        
           cp -r . "$out/src"

     

       34
       34
        
           mkdir "$out/bin"

     

       35
       35
       -
           wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin"

     

       35
       35
       +
           wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}"

     

       36
       36
        
           ln -s "$out/src/drush" "$out/bin/drush"

     

       37
       37
        
         '';

     

       38
       38
        
       }

+1 -1

pkgs/development/tools/misc/kibana/default.nix

···

       18
       18
        
           mv * $out/libexec/kibana/

     

       19
       19
        
           rm -r $out/libexec/kibana/node

     

       20
       20
        
           makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \

     

       21
       21
       -
             --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"

     

       21
       21
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"

     

       22
       22
        
           sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana

     

       23
       23
        
         '';

     

       24
       24

+1 -1

pkgs/development/tools/misc/opengrok/default.nix

···

       15
       15
        
           cp -a * $out/

     

       16
       16
        
           substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname

     

       17
       17
        
           wrapProgram $out/bin/OpenGrok \

     

       18
       18
       -
             --prefix PATH : "${ctags}/bin:${git}/bin" \

     

       18
       18
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \

     

       19
       19
        
             --set JAVA_HOME "${jre}" \

     

       20
       20
        
             --set OPENGROK_TOMCAT_BASE "/var/tomcat"

     

       21
       21
        
         '';

+1 -1

pkgs/servers/elasticmq/default.nix

···

       18
       18
        
             cp bin/run.sh $out/bin/elasticmq

     

       19
       19
        
             substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'

     

       20
       20
        
       

     

       21
       21
       -
             wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin"

     

       21
       21
       +
             wrapProgram $out/bin/elasticmq --prefix PATH : "${stdenv.lib.makeBinPath [ which jre ]}"

     

       22
       22
        
           '';

     

       23
       23
        
       

     

       24
       24
        
         meta = {

+2 -2

pkgs/servers/nosql/neo4j/default.nix

···

       23
       23
        
       

     

       24
       24
        
           mkdir -p "$out/bin"

     

       25
       25
        
           makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \

     

       26
       26
       -
               --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"

     

       26
       26
       +
               --prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"

     

       27
       27
        
           makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \

     

       28
       28
       -
               --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"

     

       28
       28
       +
               --prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"

     

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         meta = with stdenv.lib; {

+2 -2

pkgs/tools/X11/xpra/default.nix

···

       51
       51
        
             --set XPRA_LOG_DIR "\$HOME/.xpra" \

     

       52
       52
        
             --set XPRA_INSTALL_PREFIX "$out" \

     

       53
       53
        
             --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \

     

       54
       54
       -
             --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin

     

       54
       54
       +
             --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}

     

       55
       55
        
         '';

     

       56
       56
        
       

     

       57
       57
        
         preCheck = "exit 0";

     
···

       60
       60
        
         #postFixup = ''

     

       61
       61
        
         #  sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra

     

       62
       62
        
         #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra

     

       63
       63
       -
         #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra

     

       63
       63
       +
         #  sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra

     

       64
       64
        
         #'';

     

       65
       65
        
       

     

       66
       66

+2 -2

pkgs/tools/X11/xpra/gtk3.nix

···

       54
       54
        
             --set XKB_BINDIR "${xkbcomp}/bin" \

     

       55
       55
        
             --set FONTCONFIG_FILE "${fontsConf}" \

     

       56
       56
        
             --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \

     

       57
       57
       -
             --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin

     

       57
       57
       +
             --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}

     

       58
       58
        
         '';

     

       59
       59
        
       

     

       60
       60
        
         preCheck = "exit 0";

     
···

       64
       64
        
         #postFixup = ''

     

       65
       65
        
         #  sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra

     

       66
       66
        
         #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra

     

       67
       67
       -
         #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra

     

       67
       67
       +
         #  sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra

     

       68
       68
        
         #'';

     

       69
       69
        
       

     

       70
       70

+1 -1

pkgs/tools/backup/btrbk/default.nix

···

       38
       38
        
       

     

       39
       39
        
           wrapProgram $out/sbin/btrbk \

     

       40
       40
        
             --set PERL5LIB $PERL5LIB \

     

       41
       41
       -
             --prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/"

     

       41
       41
       +
             --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}"

     

       42
       42
        
         '';

     

       43
       43
        
       

     

       44
       44
        
         meta = with stdenv.lib; {

+1 -1

pkgs/tools/backup/duplicity/default.nix

···

       16
       16
        
           python setup.py install --prefix=$out

     

       17
       17
        
           wrapProgram $out/bin/duplicity \

     

       18
       18
        
             --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \

     

       19
       19
       -
             --prefix PATH : "${gnupg}/bin:${ncftp}/bin"

     

       19
       19
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp ]}"

     

       20
       20
        
           wrapProgram $out/bin/rdiffdir \

     

       21
       21
        
             --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"

     

       22
       22
        
         '';

+1 -1

pkgs/tools/backup/store-backup/default.nix

···

       41
       41
        
           for p in $out/bin/*

     

       42
       42
        
             do wrapProgram "$p" \

     

       43
       43
        
             --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \

     

       44
       44
       -
             --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"

     

       44
       44
       +
             --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}"

     

       45
       45
        
           done

     

       46
       46
        
       

     

       47
       47
        
           patchShebangs $out

+1 -1

pkgs/tools/cd-dvd/unetbootin/default.nix

···

       46
       46
        
           cp unetbootin.desktop $out/share/applications

     

       47
       47
        
       

     

       48
       48
        
           wrapProgram $out/bin/unetbootin \

     

       49
       49
       -
             --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin

     

       49
       49
       +
             --prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]}

     

       50
       50
        
         '';

     

       51
       51
        
       

     

       52
       52
        
         meta = with stdenv.lib; {

+1 -1

pkgs/tools/graphics/pdfread/default.nix

···

       39
       39
        
           cp -R *.py pylrs $PYDIR

     

       40
       40
        
       

     

       41
       41
        
           wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \

     

       42
       42
       -
             --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin

     

       42
       42
       +
             --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
        
         meta = with stdenv.lib; {

+1 -1

pkgs/tools/misc/gparted/default.nix

···

       20
       20
        
           wrapProgram $out/sbin/gparted \

     

       21
       21
        
             --prefix PATH : "${procps}/bin"

     

       22
       22
        
           wrapProgram $out/sbin/gpartedbin \

     

       23
       23
       -
             --prefix PATH : "${gpart}/bin:${hdparm}/bin:${utillinux}/bin"

     

       23
       23
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}"

     

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         meta = with stdenv.lib; {

+1 -1

pkgs/tools/misc/plowshare/default.nix

···

       20
       20
        
           make PREFIX="$out" install

     

       21
       21
        
       

     

       22
       22
        
           for fn in plow{del,down,list,up}; do

     

       23
       23
       -
             wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin"

     

       23
       23
       +
             wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}"

     

       24
       24
        
           done

     

       25
       25
        
         '';

     

       26
       26

+1 -1

pkgs/tools/misc/profile-cleaner/default.nix

···

       16
       16
        
         installPhase = ''

     

       17
       17
        
           PREFIX=\"\" DESTDIR=$out make install

     

       18
       18
        
           wrapProgram $out/bin/profile-cleaner \

     

       19
       19
       -
             --prefix PATH : "${parallel}/bin:${sqlite.bin}/bin"

     

       19
       19
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}"

     

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         meta = {

+1 -1

pkgs/tools/networking/openvpn/openvpn_learnaddress.nix

···

       15
       15
        
           install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress

     

       16
       16
        
       

     

       17
       17
        
           wrapProgram $out/libexec/openvpn/openvpn-learnaddress \

     

       18
       18
       -
               --prefix PATH : ${coreutils}/bin:${gawk}/bin:${utillinux}/bin

     

       18
       18
       +
               --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}

     

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         meta = {

+2 -2

pkgs/tools/networking/snabb/default.nix

···

       22
       22
        
           done

     

       23
       23
        
       

     

       24
       24
        
           # We need a way to pass $PATH to the scripts

     

       25
       25
       -
           sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc

     

       26
       26
       -
           sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc

     

       25
       25
       +
           sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc

     

       26
       26
       +
           sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         installPhase = ''

+1 -1

pkgs/tools/security/prey/default.nix

···

       34
       34
        
           cp -R . $out

     

       35
       35
        
           cp -R ${modulesSrc}/* $out/modules/

     

       36
       36
        
           wrapProgram "$out/prey.sh" \

     

       37
       37
       -
             --prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \

     

       37
       37
       +
             --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \

     

       38
       38
        
             --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"

     

       39
       39
        
         '';

     

       40
       40

+1 -1

pkgs/tools/typesetting/djvu2pdf/default.nix

···

       14
       14
        
         installPhase = ''

     

       15
       15
        
           mkdir -p $out/bin

     

       16
       16
        
           cp -p djvu2pdf $out/bin

     

       17
       17
       -
           wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin

     

       17
       17
       +
           wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]}

     

       18
       18
        
       

     

       19
       19
        
           mkdir -p $out/man/man1

     

       20
       20
        
           cp -p djvu2pdf.1.gz $out/man/man1

+1 -1

pkgs/tools/typesetting/docbook2odf/default.nix

···

       26
       26
        
           sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"

     

       27
       27
        
       

     

       28
       28
        
           wrapProgram "$out/bin/docbook2odf" \

     

       29
       29
       -
             --prefix PATH : "${zip}/bin:${libxslt}/bin" \

     

       29
       29
       +
             --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \

     

       30
       30
        
             --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}"

     

       31
       31
        
         '';

     

       32
       32

+1 -1

pkgs/tools/typesetting/xmlto/default.nix

···

       25
       25
        
       

     

       26
       26
        
         postInstall = ''

     

       27
       27
        
           wrapProgram "$out/bin/xmlto" \

     

       28
       28
       -
              --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin"

     

       28
       28
       +
              --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}"

     

       29
       29
        
       

     

       30
       30
        
           # `w3m' is needed for HTML to text conversions.

     

       31
       31
        
           substituteInPlace "$out/share/xmlto/format/docbook/txt" \