public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merged the stdenv branch. Yay!

Browse Source 
svn path=/nixpkgs/trunk/; revision=32821
This commit is contained in:
Eelco Dolstra 2012-03-06 11:36:22 +00:00
commit 2989ce0cac
951 changed files with 4566 additions and 5665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TODO.txt Normal file
View File

@ -0,0 +1,9 @@
This file contains list of tasks that should be done before merging
stdenv-updates back into trunk. Notation:
- TODO
* In progress
+ Done
urkud:
- Introduce libiconvOrNull and libiconvOrLibc instead of current 'magic'

23
doc/stdenv.xml
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation {
gcc foo.c -o foo
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp foo $out/bin
'';
}</programlisting>
@ -112,7 +112,7 @@ buildPhase() {
}
installPhase() {
ensureDir $out/bin
mkdir -p $out/bin
cp foo $out/bin
}
@ -939,14 +939,6 @@ functions.</para>
<variablelist>
<varlistentry xml:id='fun-ensureDir'>
<term><function>ensureDir</function> <replaceable>args</replaceable></term>
<listitem><para>Creates the specified directories, including all
necessary parent directories, if they do not already
exist.</para></listitem>
</varlistentry>
<varlistentry xml:id='fun-substitute'>
<term><function>substitute</function>
<replaceable>infile</replaceable>
@ -1062,7 +1054,16 @@ echo @foo@
That is, no substitution is performed for undefined variables.</para></listitem>
</varlistentry>
<varlistentry xml:id='fun-substituteAllInPlace'>
<term><function>substituteAllInPlace</function>
<replaceable>file</replaceable></term>
<listitem><para>Like <function>substituteAll</function>, but performs
the substitutions in place on the file
<replaceable>file</replaceable>.</para></listitem>
</varlistentry>
<varlistentry xml:id='fun-stripHash'>
<term><function>stripHash</function>
<replaceable>path</replaceable></term>

6
maintainers/docs/cross.txt
View File

@ -233,9 +233,9 @@ preConfigure() {
fi
# Cross compiler evilness
ensureDir $out
ensureDir $out/arm-linux
ensureDir $out/arm-linux/bin
mkdir -p $out
mkdir -p $out/arm-linux
mkdir -p $out/arm-linux/bin
ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar

2
maintainers/scripts/eval-release.nix
View File

@ -17,7 +17,7 @@ let
call = attrs: flip mapAttrs attrs
(n: v: trace n (
if builtins.isFunction v then maybe (v { system = "i686-linux"; })
if builtins.isFunction v then maybe (v { system = "x86_64-linux"; })
else if builtins.isAttrs v then call v
else null
));

2
pkgs/applications/audio/ardour/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
];
buildPhase = ''
ensureDir $out
mkdir -p $out
export CXX=g++
scons PREFIX=$out install
'';

2
pkgs/applications/audio/gmu/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postInstall = ''
cp ${keymap}.keymap $out/share/gmu/default.keymap
cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
ensureDir $out/etc/gmu
mkdir -p $out/etc/gmu
cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
'';

2
pkgs/applications/audio/id3v2/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
preInstall = ''
ensureDir $out/bin $out/man/man1
mkdir -p $out/bin $out/man/man1
'';
meta = {

2
pkgs/applications/audio/ladspa-plugins/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
postInstall =
''
ensureDir $out/share/ladspa/
mkdir -p $out/share/ladspa/
ln -sv $out/lib/ladspa $out/share/ladspa/lib
'';

2
pkgs/applications/audio/ladspa-plugins/ladspah.nix
View File

@ -13,7 +13,7 @@ in
in with localDefs;
let
copyFile = fullDepEntry ("
ensureDir \$out/include
mkdir -p \$out/include
cp ${src} \$out/include/ladspa.h
") [minInit defEnsureDir];
in

4
pkgs/applications/audio/mp3info/default.nix
View File

@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
'';
preInstall =
'' ensureDir "$out/bin"
ensureDir "$out/man/man1"
'' mkdir -p "$out/bin"
mkdir -p "$out/man/man1"
'';
meta = {

2
pkgs/applications/audio/mpc123/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase =
# XXX: Should install locales too (though there's only 1 available).
'' ensureDir "$out/bin"
'' mkdir -p "$out/bin"
cp -v mpc123 "$out/bin"
'';

2
pkgs/applications/audio/snd/default.nix
View File

@ -40,7 +40,7 @@ rec {
makeDocsWork = fullDepEntry ''
# hackish way to make html docs work
h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h"
patch -p1 < ${./doc.patch}
sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
'' ["defEnsureDir"];

2
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/{bin,share/sonic-visualiser}
mkdir -p $out/{bin,share/sonic-visualiser}
cp sonic-visualiser/sonic-visualiser $out/bin
cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib

2
pkgs/applications/audio/vkeybd/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
configurePhase = ''
ensureDir $out/bin
mkdir -p $out/bin
sed -e "s@/usr/local@$out@" -i Makefile
'';

4
pkgs/applications/audio/xsynth-dssi/default.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
ladspaPlugins liblo pkgconfig ];
installPhase = ''
ensureDir $out/bin
ensureDir $out/lib
mkdir -p $out/bin
mkdir -p $out/lib
cp src/Xsynth_gtk $out/bin
cp src/.libs/* $out/lib
'';

4
pkgs/applications/editors/eclipse/default.nix
View File

@ -27,7 +27,7 @@ let
buildCommand = ''
# Unpack tarball.
ensureDir $out
mkdir -p $out
tar xfvz $src -C $out
# Patch binaries.
@ -47,7 +47,7 @@ let
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.
ensureDir $out/share/applications
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
''; # */

4
pkgs/applications/editors/ed/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "ed-1.4";
name = "ed-1.5";
src = fetchurl {
url = "mirror://gnu/ed/${name}.tar.gz";
sha256 = "1njgcghms1377csldi1yqjhcpghiii6bshdhnjpqp78sxs2xldnv";
sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
};
doCheck = true;

6
pkgs/applications/editors/elvis/default.nix
View File

@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
ensureDir $out/share/man/man1
mkdir -p $out/share/man/man1
'';
installPhase = ''
ensureDir $out/bin $out/share/elvis $out/share/elvis/doc
mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc
cp elvis ref elvtags elvfmt $out/bin
cp -R data/* $out/share/elvis
cp doc/* $out/share/elvis/doc
ensureDir $out/share/man/man1
mkdir -p $out/share/man/man1
for a in doc/*.man; do
cp $a $out/share/man/man1/`basename $a .man`.1
done

2
pkgs/applications/editors/emacs-modes/bbdb/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [emacs texinfo ctags];
configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
preInstall = "ensureDir $out/info";
preInstall = "mkdir -p $out/info";
installTargets = "install-pkg texinfo";
postInstall = ''
mv $out/info $out/share/

4
pkgs/applications/editors/emacs-modes/cedet/default.nix
View File

@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
checkPhase = "make utest";
installPhase = ''
ensureDir "$out/share/emacs/site-lisp"
mkdir -p "$out/share/emacs/site-lisp"
cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp"
chmod a-x "$out/share/emacs/site-lisp/"*
ensureDir "$out/share/info"
mkdir -p "$out/share/info"
cp -v */*.info* */*/*.info* "$out/share/info"
'';

4
pkgs/applications/editors/emacs-modes/ecb/default.nix
View File

@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir "$out/share/emacs/site-lisp"
mkdir -p "$out/share/emacs/site-lisp"
cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
ensureDir "$out/share/info"
mkdir -p "$out/share/info"
cp -v info-help/*.info* "$out/share/info"
'';

4
pkgs/applications/editors/emacs-modes/emms/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
s|/usr/include/taglib|${taglib}/include/taglib|g ;
s|/usr/lib|${taglib}/lib|g ;
s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
ensureDir "$out/share/man/man1"
mkdir -p "$out/share/man/man1"
sed -i "emms-player-mpg321-remote.el" \
-e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
ensureDir "$out/bin" && cp emms-print-metadata "$out/bin"
mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
'';
meta = {

2
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [emacs];
installPhase = ''
ensureDir "$out/share/emacs/site-lisp"
mkdir -p "$out/share/emacs/site-lisp"
cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
'';

2
pkgs/applications/editors/emacs-modes/hol_light/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = ''
DEST=$out/share/emacs/site-lisp
ensureDir $DEST
mkdir -p $DEST
cp -a * $DEST
'';

4
pkgs/applications/editors/emacs-modes/jdee/default.nix
View File

@ -23,7 +23,7 @@ in
];
configurePhase = ''
ensureDir "dist"
mkdir -p "dist"
cat > build.properties <<EOF
dist.lisp.dir = dist/share/emacs/site-lisp
dist.java.lib.dir = dist/lib/java
@ -50,7 +50,7 @@ in
installPhase = ''
ant install
ensureDir "$out/share/${name}"
mkdir -p "$out/share/${name}"
cp -rv java/bsh-commands "$out/share/${name}"
# Move everything that's not a JAR to $datadir. This includes

4
pkgs/applications/editors/emacs-modes/org/default.nix
View File

@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
installPhase =
'' make install install-info
ensureDir "$out/share/doc/${name}"
mkdir -p "$out/share/doc/${name}"
cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}"
ensureDir "$out/share/org"
mkdir -p "$out/share/org"
cp -R contrib "$out/share/org/contrib"
'';

2
pkgs/applications/editors/emacs-modes/quack/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildPhase = ''
emacsDir="$out/share/emacs/site-lisp"
ensureDir "$emacsDir"
mkdir -p "$emacsDir"
cp -v "$src" "$emacsDir/quack.el"
emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
'';

2
pkgs/applications/editors/emacs-modes/rudel/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation
installPhase = ''
for n in . obby zeroconf jupiter; do
ensureDir "$out/share/emacs/site-lisp/$n";
mkdir -p "$out/share/emacs/site-lisp/$n";
cp $n/*.el "$out/share/emacs/site-lisp/$n/";
done
install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"

2
pkgs/applications/editors/emacs-modes/scala-mode/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ emacs ];
installPhase =
'' ensureDir "$out/share/emacs/site-lisp"
'' mkdir -p "$out/share/emacs/site-lisp"
cp -v *.el *.elc "$out/share/emacs/site-lisp"
'';

2
pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [emacs];
installPhase = ''
ensureDir "$out/share/emacs/site-lisp"
mkdir -p "$out/share/emacs/site-lisp"
cp lisp/*.el "$out/share/emacs/site-lisp/"
'';

14
pkgs/applications/editors/jedit/default.nix
View File

@ -17,19 +17,19 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/share/jEdit
mkdir -p $out/share/jEdit
cp build/jedit.jar $out/share/jEdit
ensureDir $out/share/jEdit/modes
mkdir -p $out/share/jEdit/modes
cp -r modes/* $out/share/jEdit/modes
ensureDir $out/share/jEdit/icons
mkdir -p $out/share/jEdit/icons
cp -r icons/* $out/share/jEdit/icons
ensureDir $out/share/jEdit/macros
mkdir -p $out/share/jEdit/macros
cp -r macros/* $out/share/jEdit/macros
ensureDir $out/share/jEdit/doc
mkdir -p $out/share/jEdit/doc
cp -r doc/* $out/share/jEdit/doc
sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
ensureDir $out/share/applications
mkdir -p $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
patch package-files/linux/jedit << EOF
@ -39,7 +39,7 @@ stdenv.mkDerivation {
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
ensureDir $out/bin
mkdir -p $out/bin
cp package-files/linux/jedit $out/bin/jedit
chmod +x $out/bin/jedit
'';

2
pkgs/applications/editors/jedit/wrapper.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
phases = "buildPhase";
buildPhase = "
ensureDir \$out/bin
mkdir -p \$out/bin
cat > \$out/bin/${jedit.name} << EOF
#!/bin/sh
exec $java -jar $jeditjar \\$*

2
pkgs/applications/editors/nedit/builder.sh
View File

@ -3,7 +3,7 @@ source $stdenv/setup
export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
installPhase() {
ensureDir $out/bin
mkdir -p $out/bin
cp -p source/nedit source/nc $out/bin
}

4
pkgs/applications/editors/nvi/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin $out/share/vi/catalog
mkdir -p $out/bin $out/share/vi/catalog
for a in dutch english french german ru_SU.KOI8-R spanish swedish; do
cp ../catalog/$a $out/share/vi/catalog
done
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
ln -s $out/bin/nvi $out/bin/ex
ln -s $out/bin/nvi $out/bin/view
ensureDir $out/share/man/man1
mkdir -p $out/share/man/man1
cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1
ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi
ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex

7
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -12,20 +12,19 @@
, libtool
, jasper
, libX11
, xz
, tetex ? null
, librsvg ? null
}:
let
version = "6.6.9-4";
version = "6.7.5-3";
in
stdenv.mkDerivation rec {
name = "ImageMagick-${version}";
src = fetchurl {
url = "mirror://imagemagick/${name}.tar.xz";
sha256 = "035j3i3cm29bwc9lipn838gznswrc69g7mwh8h9jj24ss2dmqrf1";
sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
};
configureFlags = ''
@ -41,8 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [ tetex graphviz ];
buildNativeInputs = [ xz ];
preConfigure = if tetex != null then
''
export DVIDecodeDelegate=${tetex}/bin/dvips

4
pkgs/applications/graphics/dia/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
, withGNOME ? false, libgnomeui, xz }:
, withGNOME ? false, libgnomeui }:
stdenv.mkDerivation rec {
name = src.pkgname;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
libxslt docbook_xsl libart_lgpl
] ++ stdenv.lib.optional withGNOME libgnomeui;
buildNativeInputs = [ pkgconfig intltool perl xz ];
buildNativeInputs = [ pkgconfig intltool perl ];
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";

10
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -15,11 +15,11 @@ let
prePhases = "extraLib";
extraLib = ''
installScripts(){
ensureDir ${targetScriptDir};
mkdir -p ${targetScriptDir};
for p in "$@"; do cp "$p" ${targetScriptDir}; done
}
installPlugins(){
ensureDir ${targetPluginDir};
mkdir -p ${targetPluginDir};
for p in "$@"; do cp "$p" ${targetPluginDir}; done
}
'';
@ -137,7 +137,7 @@ rec {
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
};
#postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
#postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
installPhase = "installPlugins src/gimp-lqr-plugin";
};
@ -190,7 +190,7 @@ rec {
};
installPhase = "
installPlugins ufraw-gimp
ensureDir $out/bin
mkdir -p $out/bin
cp ufraw $out/bin
";
};
@ -209,7 +209,7 @@ rec {
installPhase = "
installPlugins gimplensfun
ensureDir $out/bin
mkdir -p $out/bin
cp gimplensfun $out/bin
";

2
pkgs/applications/graphics/jbrout/default.nix
View File

@ -20,7 +20,7 @@ buildPythonPackage {
'';
postInstall = ''
ensureDir $out/bin
mkdir -p $out/bin
echo '#!/bin/sh' > $out/bin/jbrout
echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout
chmod +x $out/bin/jbrout

2
pkgs/applications/graphics/meshlab/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/opt/meshlab $out/bin $out/lib
mkdir -p $out/opt/meshlab $out/bin $out/lib
pushd distrib
cp -R * $out/opt/meshlab
popd

2
pkgs/applications/graphics/minidjvu/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ libtiff gettext];
preInstall = ''
ensureDir $out/lib
mkdir -p $out/lib
'';
meta = {

2
pkgs/applications/graphics/pinta/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
# Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries?
installPhase = ''
ensureDir $out/lib/pinta $out/bin
mkdir -p $out/lib/pinta $out/bin
cp bin/*.{dll,exe} $out/lib/pinta
cat > $out/bin/pinta << EOF
#!/bin/sh

2
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
installPhase = ''
ensureDir $out/bin $out/lib
mkdir -p $out/bin $out/lib
cp rtgui/rt $out/bin
# Weird kind of path reference
cp -r ../release/* $out/bin

2
pkgs/applications/graphics/wings/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ erlang esdl ];
installPhase = ''
ensureDir $out/bin $out/lib/${name}/ebin
mkdir -p $out/bin $out/lib/${name}/ebin
cp ebin/* $out/lib/${name}/ebin
cp -R fonts textures shaders plugins $out/lib/$name
cat << EOF > $out/bin/wings

2
pkgs/applications/graphics/xaos/default.nix
View File

@ -22,7 +22,7 @@ rec {
preConfigure = a.fullDepEntry (''
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
ensureDir $out/share/locale
mkdir -p $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"];
name = "xaos-" + version;

4
pkgs/applications/misc/adobe-reader/builder.sh
View File

@ -3,7 +3,7 @@ source $stdenv/setup
echo "unpacking $src..."
tar xvfa $src
ensureDir $out/Adobe/Reader9
mkdir -p $out/Adobe/Reader9
echo "unpacking reader..."
set +e
@ -24,5 +24,5 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \
--replace /bin/ls $(type -P ls) \
--replace xargs "xargs -r"
ensureDir $out/bin
mkdir -p $out/bin
ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread

2
pkgs/applications/misc/audio/wavesurfer/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ snack tcl tk makeWrapper ];
installPhase = ''
ensureDir $out/{bin,nix-support,share/wavesurfer/}
mkdir -p $out/{bin,nix-support,share/wavesurfer/}
mv doc $out/share/wavesurfer
mv * $out/nix-support
ln -s $out/{nix-support,bin}/wavesurfer.tcl

2
pkgs/applications/misc/bitcoin/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp bitcoin-qt $out/bin
cp src/bitcoind $out/bin
'';

2
pkgs/applications/misc/calibre/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
inherit python;
buildNativeInputs = [ makeWrapper xz pkgconfig ];
buildNativeInputs = [ makeWrapper pkgconfig ];
buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg

11
pkgs/applications/misc/djvulibre/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
, libungif, zlib, x11, libX11, mesa, qt3 }:
{ stdenv, fetchurl, libjpeg, libtiff, libpng, ghostscript, libungif, zlib }:
stdenv.mkDerivation rec {
name = "djvulibre-3.5.24";
@ -9,12 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0";
};
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++
stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa];
buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ];
patches = [ ./gcc-4.6.patch ];
meta = {
description = "A library and viewer for the DJVU file format for scanned images";
homepage = http://djvu.sourceforge.net;
maintainers = [ lib.maintainers.urkud ];
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;
};
}

658
pkgs/applications/misc/djvulibre/gcc-4.6.patch Normal file
View File

@ -0,0 +1,658 @@
commit 3341545edba359b292a8ef6db1b7d342caf3dcf1
Author: Leon Bottou <leon@bottou.org>
Date: Wed May 4 21:25:35 2011 -0700
Added include <stddef.h> for gcc-4.6
diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
index b762ccf..d662ab0 100644
--- a/libdjvu/BSByteStream.cpp
+++ b/libdjvu/BSByteStream.cpp
@@ -62,6 +62,7 @@
// - Author: Leon Bottou, 07/1998
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
index 5d80e51..68bc3e3 100644
--- a/libdjvu/BSEncodeByteStream.cpp
+++ b/libdjvu/BSEncodeByteStream.cpp
@@ -71,6 +71,7 @@
#include "GOS.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
index 158c33c..be01847 100644
--- a/libdjvu/ByteStream.cpp
+++ b/libdjvu/ByteStream.cpp
@@ -73,6 +73,7 @@
#include "GOS.h"
#include "GURL.h"
#include "DjVuMessage.h"
+#include <stddef.h>
#include <fcntl.h>
#if defined(WIN32) || defined(__CYGWIN32__)
# include <io.h>
diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
index 6b1e85d..7d7a192 100644
--- a/libdjvu/DjVuFileCache.cpp
+++ b/libdjvu/DjVuFileCache.cpp
@@ -63,6 +63,7 @@
#include "DjVuFileCache.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
index e6d3cec..df9278e 100644
--- a/libdjvu/DjVuGlobal.cpp
+++ b/libdjvu/DjVuGlobal.cpp
@@ -76,6 +76,8 @@
#include "GThreads.h"
#include "GException.h"
#include "GContainer.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
index 3c6012c..c8ba309 100644
--- a/libdjvu/DjVuGlobalMemory.cpp
+++ b/libdjvu/DjVuGlobalMemory.cpp
@@ -67,6 +67,8 @@
#include "DjVuGlobal.h"
#include "GException.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "debug.h"
diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
index 6f5a735..1726025 100644
--- a/libdjvu/DjVuMessage.cpp
+++ b/libdjvu/DjVuMessage.cpp
@@ -71,6 +71,7 @@
#include "debug.h"
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
#ifdef WIN32
# include <tchar.h>
diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
index b8c1010..5daa9d9 100644
--- a/libdjvu/DjVuMessageLite.cpp
+++ b/libdjvu/DjVuMessageLite.cpp
@@ -73,8 +73,8 @@
#include "debug.h"
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
-// #include <stdio.h>
#ifdef WIN32
#include <tchar.h>
#include <windows.h>
diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
index c489f7b..76b0bf4 100644
--- a/libdjvu/DjVuPalette.cpp
+++ b/libdjvu/DjVuPalette.cpp
@@ -64,6 +64,8 @@
#include "ByteStream.h"
#include "BSByteStream.h"
#include "DjVuPalette.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
index f6a92f6..e2b3125 100644
--- a/libdjvu/DjVuPort.h
+++ b/libdjvu/DjVuPort.h
@@ -65,6 +65,7 @@
#include "GThreads.h"
#include "GURL.h"
+#include "stddef.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {
diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
index 5517bf3..6914ff9 100644
--- a/libdjvu/DjVuToPS.cpp
+++ b/libdjvu/DjVuToPS.cpp
@@ -72,6 +72,7 @@
#include "GPixmap.h"
#include "debug.h"
#include <stdarg.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
index ab5c0de..797edcc 100644
--- a/libdjvu/GBitmap.cpp
+++ b/libdjvu/GBitmap.cpp
@@ -66,6 +66,8 @@
#include "GString.h"
#include "GThreads.h"
#include "GException.h"
+#include <stddef.h>
+#include <stdlib.h>
#include <string.h>
// - Author: Leon Bottou, 05/1997
diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
index 2ea179a..89da70f 100644
--- a/libdjvu/GException.cpp
+++ b/libdjvu/GException.cpp
@@ -60,6 +60,7 @@
# pragma implementation
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
index e784932..d2088e2 100644
--- a/libdjvu/GOS.cpp
+++ b/libdjvu/GOS.cpp
@@ -65,6 +65,7 @@
#include "GOS.h"
#include "GURL.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
index 392df54..4bf6f57 100644
--- a/libdjvu/GPixmap.cpp
+++ b/libdjvu/GPixmap.cpp
@@ -75,6 +75,8 @@
#include "GThreads.h"
#include "Arrays.h"
#include "JPEGDecoder.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
#include <assert.h>
diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
index 6e523e7..58aef5b 100644
--- a/libdjvu/GSmartPointer.cpp
+++ b/libdjvu/GSmartPointer.cpp
@@ -67,6 +67,7 @@
// Our original implementation consisted of multiple classes.
// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+#include <stddef.h>
#include <string.h>
#if PARANOID_DEBUG
# include <assert.h>
diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
index 82781bd..8a8bb8a 100644
--- a/libdjvu/GSmartPointer.h
+++ b/libdjvu/GSmartPointer.h
@@ -97,6 +97,8 @@
#include "DjVuGlobal.h"
#include "atomic.h"
+#include <stddef.h>
+
#ifdef HAVE_NAMESPACES
namespace DJVU {
# ifdef NOT_DEFINED // Just to fool emacs c++ mode
diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
index 03f6226..350b11b 100644
--- a/libdjvu/GString.cpp
+++ b/libdjvu/GString.cpp
@@ -73,6 +73,7 @@
#include "GThreads.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/GString.h b/libdjvu/GString.h
index b63b753..3aa1f76 100644
--- a/libdjvu/GString.h
+++ b/libdjvu/GString.h
@@ -108,6 +108,7 @@
#include "DjVuGlobal.h"
#include "GContainer.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#ifdef WIN32
diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
index d81f3c3..253fed8 100644
--- a/libdjvu/GThreads.cpp
+++ b/libdjvu/GThreads.cpp
@@ -71,6 +71,8 @@
#include "GThreads.h"
#include "GException.h"
#include "DjVuMessageLite.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
index c37bf52..a80078c 100644
--- a/libdjvu/GURL.cpp
+++ b/libdjvu/GURL.cpp
@@ -72,6 +72,7 @@
#include "GURL.h"
#include "debug.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
index 415c081..a8b25b8 100644
--- a/libdjvu/GUnicode.cpp
+++ b/libdjvu/GUnicode.cpp
@@ -62,6 +62,8 @@
#include "GString.h"
+#include <stddef.h>
+
#if HAS_ICONV
#include <iconv.h>
#endif
diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
index a653f8c..e31b216 100644
--- a/libdjvu/IFFByteStream.h
+++ b/libdjvu/IFFByteStream.h
@@ -124,6 +124,7 @@
#include "DjVuGlobal.h"
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
index 8d7b12c..49081b7 100644
--- a/libdjvu/IW44EncodeCodec.cpp
+++ b/libdjvu/IW44EncodeCodec.cpp
@@ -76,6 +76,7 @@
#include "IFFByteStream.h"
#include "GRect.h"
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
index 9476726..4a19fb5 100644
--- a/libdjvu/IW44Image.cpp
+++ b/libdjvu/IW44Image.cpp
@@ -76,6 +76,7 @@
#include "IFFByteStream.h"
#include "GRect.h"
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
index bd430a0..fad1d4c 100644
--- a/libdjvu/JPEGDecoder.h
+++ b/libdjvu/JPEGDecoder.h
@@ -64,6 +64,7 @@
#ifdef NEED_JPEG_DECODER
+#include <stddef.h>
#include <string.h>
#include <setjmp.h>
diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
index 5ab60bb..528dab6 100644
--- a/libdjvu/MMX.cpp
+++ b/libdjvu/MMX.cpp
@@ -62,6 +62,7 @@
#include "MMX.h"
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
index 0ae112b..9b49a17 100644
--- a/libdjvu/UnicodeByteStream.h
+++ b/libdjvu/UnicodeByteStream.h
@@ -88,6 +88,7 @@
#include "GString.h"
#include "ByteStream.h"
+#include <stddef.h>
#ifdef HAVE_NAMESPACES
namespace DJVU {
diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
index 84386c5..7da923a 100644
--- a/libdjvu/XMLParser.cpp
+++ b/libdjvu/XMLParser.cpp
@@ -75,6 +75,7 @@
#include "debug.h"
#include <stdio.h>
#include <ctype.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
index f6e971d..ff5b9bf 100644
--- a/libdjvu/ZPCodec.cpp
+++ b/libdjvu/ZPCodec.cpp
@@ -66,6 +66,8 @@
#include "ZPCodec.h"
#include "ByteStream.h"
#include "GException.h"
+
+#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include <math.h>
diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
index bdc193e..63fd483 100644
--- a/libdjvu/atomic.cpp
+++ b/libdjvu/atomic.cpp
@@ -28,6 +28,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include "atomic.h"
diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
index b18b84b..f40f5aa 100644
--- a/libdjvu/ddjvuapi.cpp
+++ b/libdjvu/ddjvuapi.cpp
@@ -60,6 +60,7 @@
# pragma implementation "ddjvuapi.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
index d0ed48f..841f223 100644
--- a/libdjvu/ddjvuapi.h
+++ b/libdjvu/ddjvuapi.h
@@ -64,6 +64,7 @@ extern "C" {
}
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
index e0fb087..fc51297 100644
--- a/libdjvu/miniexp.cpp
+++ b/libdjvu/miniexp.cpp
@@ -23,6 +23,7 @@
# pragma implementation "miniexp.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
index 91e345d..993005b 100644
--- a/libdjvu/miniexp.h
+++ b/libdjvu/miniexp.h
@@ -38,7 +38,8 @@ extern "C" {
#ifndef MINILISPAPI
# define MINILISPAPI /**/
#endif
-
+
+#include <stddef.h>
/* -------------------------------------------------- */
/* LISP EXPRESSIONS */
diff --git a/tools/bzz.cpp b/tools/bzz.cpp
index ca092e1..2ebc7b9 100644
--- a/tools/bzz.cpp
+++ b/tools/bzz.cpp
@@ -94,6 +94,7 @@
#include "GURL.h"
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
static const char *program = "(unknown)";
diff --git a/tools/c44.cpp b/tools/c44.cpp
index 6f23b53..855504b 100644
--- a/tools/c44.cpp
+++ b/tools/c44.cpp
@@ -226,6 +226,7 @@
#include <locale.h>
#include <stdio.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
// command line data
diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
index 8cf89b9..11eb662 100644
--- a/tools/cjb2.cpp
+++ b/tools/cjb2.cpp
@@ -120,6 +120,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#if HAVE_TIFF
#include <tiffio.h>
diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
index 111cbd3..b640a7a 100644
--- a/tools/cpaldjvu.cpp
+++ b/tools/cpaldjvu.cpp
@@ -118,6 +118,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#include <math.h>
diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
index cd721f8..d5203d5 100644
--- a/tools/csepdjvu.cpp
+++ b/tools/csepdjvu.cpp
@@ -162,6 +162,7 @@
#include "jb2tune.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#undef MIN
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
index 817e045..981a270 100644
--- a/tools/ddjvu.cpp
+++ b/tools/ddjvu.cpp
@@ -62,6 +62,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/djvm.cpp b/tools/djvm.cpp
index 951bd66..6ea88c2 100644
--- a/tools/djvm.cpp
+++ b/tools/djvm.cpp
@@ -135,9 +135,9 @@
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdlib.h>
static const char * progname;
diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
index 9ca1c54..20b468a 100644
--- a/tools/djvmcvt.cpp
+++ b/tools/djvmcvt.cpp
@@ -144,6 +144,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
static const char * progname;
diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
index 6a0215a..2dddbdf 100644
--- a/tools/djvudump.cpp
+++ b/tools/djvudump.cpp
@@ -119,6 +119,7 @@ xxx
#include <locale.h>
#include <stdio.h>
#include <ctype.h>
+#include <stddef.h>
#include <stdlib.h>
void
diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
index 4a9f381..907b99c 100644
--- a/tools/djvuextract.cpp
+++ b/tools/djvuextract.cpp
@@ -105,6 +105,7 @@
#include "GOS.h"
#include "DjVuMessage.h"
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
index 7020484..4c5fc0f 100644
--- a/tools/djvumake.cpp
+++ b/tools/djvumake.cpp
@@ -153,6 +153,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/tools/djvups.cpp b/tools/djvups.cpp
index 51aa999..632b832 100644
--- a/tools/djvups.cpp
+++ b/tools/djvups.cpp
@@ -57,6 +57,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/djvused.cpp b/tools/djvused.cpp
index de84dcd..687fdca 100644
--- a/tools/djvused.cpp
+++ b/tools/djvused.cpp
@@ -61,6 +61,7 @@
#endif
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <errno.h>
diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
index 19a17da..818fe78 100644
--- a/tools/djvuserve.cpp
+++ b/tools/djvuserve.cpp
@@ -73,6 +73,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
index ba2c745..9e9124c 100644
--- a/tools/djvutxt.cpp
+++ b/tools/djvutxt.cpp
@@ -61,6 +61,7 @@
# include "config.h"
#endif
+#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
index 082f5fb..656dc43 100644
--- a/tools/tiff2pdf.h
+++ b/tools/tiff2pdf.h
@@ -22,6 +22,7 @@
# endif
# if HAVE_TIFF
# include <stdio.h>
+# include <stddef.h>
# include <stdlib.h>
# include <tiff.h>
# include <tiffio.h>
diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
index 17c769b..b40535e 100644
--- a/xmltools/djvutoxml.cpp
+++ b/xmltools/djvutoxml.cpp
@@ -71,6 +71,7 @@
#include <locale.h>
#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
index bdc5768..6679a9d 100644
--- a/xmltools/djvuxmlparser.cpp
+++ b/xmltools/djvuxmlparser.cpp
@@ -70,6 +70,7 @@
#include <stdio.h>
#include <ctype.h>
#include <locale.h>
+#include <stddef.h>
#include <stdlib.h>
static void

2
pkgs/applications/misc/freemind/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
# JDK 7 beta seems to have fixed this (bug ?)
installPhase = ''
ensureDir $out/{bin,nix-support}
mkdir -p $out/{bin,nix-support}
cp -r ../bin/dist $out/nix-support
sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
cat > $out/bin/freemind << EOF

2
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
buildInputs = [makeWrapper perl];
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp get_iplayer $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
'';

2
pkgs/applications/misc/googleearth/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation {
'';
installPhase =''
ensureDir $out/{opt/googleearth/,bin};
mkdir -p $out/{opt/googleearth/,bin};
tar xf googleearth-data.tar -C $out/opt/googleearth
tar xf googleearth-linux-x86.tar -C $out/opt/googleearth
cp bin/googleearth $out/opt/googleearth

2
pkgs/applications/misc/jbidwatcher/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildPhase = "true";
installPhase = ''
ensureDir "$out/bin"
mkdir -p "$out/bin"
echo > "$out/bin/${pname}" "#!/bin/sh"
echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
chmod +x "$out/bin/${pname}"

4
pkgs/applications/misc/lyx/default.nix
View File

@ -1,6 +1,6 @@
# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
, libX11, qt, xz
, libX11, qt
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
};
buildInputs = [texLive qt python makeWrapper xz pkgconfig ];
buildInputs = [texLive qt python makeWrapper pkgconfig ];
# don't ask me why it can't find libX11.so.6
postInstall = ''

2
pkgs/applications/misc/makeself/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
unpackPhase = "sh ${src}";
installPhase = ''
cd ${name}
ensureDir $out/{bin,share/{${name},man/man1}}
mkdir -p $out/{bin,share/{${name},man/man1}}
mv makeself.lsm README $out/share/${name}
mv makeself.sh $out/bin/makeself
mv makeself.1 $out/share/man/man1/

2
pkgs/applications/misc/navipowm/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin $out/share/${name}/Icons
mkdir -p $out/bin $out/share/${name}/Icons
cp bin/NaviPOWM $out/bin
cp ../../common/Config/navipowm.ini $out/share/${name}
cp ../../common/Images/* $out/share/${name}

2
pkgs/applications/misc/openjump/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
# error. Still this is better than getting it always.
# TODO: build from source and patch this
unpackPhase = ''
ensureDir $out/bin;
mkdir -p $out/bin;
cd $out; unzip $src
s=$out/bin/OpenJump
dir=$(echo $out/openjump-*)

2
pkgs/applications/misc/procmail/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation {
# getline is defined differently in glibc now. So rename it.
installPhase = "
ensureDir \$out/bin
mkdir -p \$out/bin
sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile
sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile

2
pkgs/applications/misc/pstree/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
unpackPhase = "unpackFile \$src; sourceRoot=.";
buildPhase = "pwd; gcc -o pstree pstree.c";
installPhase = "ensureDir \$out/bin; cp pstree \$out/bin";
installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin";
meta = {
description = "Show the set of running processes as a tree";

2
pkgs/applications/misc/qcad/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation {
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
installPhase = ''
ensureDir $out/{bin,share}
mkdir -p $out/{bin,share}
cp -r qcad $out/share
# The compilation does not fail with error code. But qcad will not exist

2
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+ stdenv.lib.optionalString perlSupport ''
ensureDir $out/lib/perl5
mkdir -p $out/lib/perl5
ln -s $out/{lib/urxvt,lib/perl5/site_perl}
'';

2
pkgs/applications/misc/sbagen/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
buildPhase = "./mk";
installPhase = ''
ensureDir $out/{bin,share/sbagen/doc}
mkdir -p $out/{bin,share/sbagen/doc}
cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg
cp sbagen $out/bin
cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt

2
pkgs/applications/misc/thinking-rock/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
ls -1 bin/* | grep -ve 'bin/tr''$' | xargs rm
# don't keep the other .exe file either
find . -iname "*.exe" | xargs -n1 rm
ensureDir $out/{nix-support/tr-files,bin}
mkdir -p $out/{nix-support/tr-files,bin}
cp -r . $out/nix-support/tr-files
cat >> $out/bin/thinkingrock << EOF
#!/bin/sh

2
pkgs/applications/misc/vue/default.nix
View File

@ -31,7 +31,7 @@ rec {
doDeploy = a.fullDepEntry ''
unzip ${src}
ensureDir "$out"/{share/vue,bin}
mkdir -p "$out"/{share/vue,bin}
cp VUE.jar "$out/share/vue/vue.jar"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"

8
pkgs/applications/misc/xpdf/libxpdf.nix
View File

@ -31,10 +31,10 @@ stdenv.mkDerivation {
];
installPhase = ''
ensureDir $out/lib/goo
ensureDir $out/lib/fofi
ensureDir $out/lib/xpdf
ensureDir $out/include
mkdir -p $out/lib/goo
mkdir -p $out/lib/fofi
mkdir -p $out/lib/xpdf
mkdir -p $out/include
cp -v goo/libGoo.a $out/lib/goo
cp -v fofi/libfofi.a $out/lib/fofi

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
];
installPhase = ''
ensureDir $out/bin
ensureDir $out/libexec/chrome
mkdir -p $out/bin
mkdir -p $out/libexec/chrome
cp -R * $out/libexec/chrome

9
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -12,14 +12,14 @@
rec {
firefoxVersion = "3.6.21";
firefoxVersion = "3.6.27";
xulVersion = "1.9.2.21"; # this attribute is used by other packages
xulVersion = "1.9.2.27"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c";
sha1 = "dd472a10e4ef5b017f00074d0325be13e832d610";
};
@ -50,6 +50,9 @@ rec {
./xulrunner-chromium-mips.patch
./xulrunner-mips-n32.patch
./xulrunner-1.9.2_beta4-mips-bus-error.patch
# Fix building on GCC 4.6.
./gcc-4.6.patch
];
buildInputs =

13
pkgs/applications/networking/browsers/firefox/gcc-4.6.patch Normal file
View File

@ -0,0 +1,13 @@
https://346825.bugs.gentoo.org/attachment.cgi?id=270163
--- a/gfx/ots/src/os2.cc
+++ b/gfx/ots/src/os2.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <cstddef>
+
#include "os2.h"
#include "head.h"

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
--suffix-each LD_LIBRARY_PATH ':' "$libs" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
ensureDir $out/share/applications
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications
'';

6
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
, libnotify, gnome_vfs, libgnomeui
, freetype, fontconfig, wirelesstools ? null, pixman
@ -19,7 +19,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ xz libgnomeui libnotify gnome_vfs alsaLib
[ libgnomeui libnotify gnome_vfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
python ply dbus dbus_glib pango freetype fontconfig
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
@ -84,7 +84,7 @@ stdenv.mkDerivation {
fi
# Put the GNU IceCat icon in the right place.
ensureDir "$out/lib/$libDir/chrome/icons/default"
mkdir -p "$out/lib/$libDir/chrome/icons/default"
ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
'';

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
View File

@ -15,7 +15,7 @@ unpackPhase() {
}
installPhase() {
ensureDir $out/lib/mozilla/plugins
mkdir -p $out/lib/mozilla/plugins
cp -pv libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
}

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
View File

@ -15,7 +15,7 @@ unpackPhase() {
}
installPhase() {
ensureDir $out/lib/mozilla/plugins
mkdir -p $out/lib/mozilla/plugins
cp -pv libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
}

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
View File

@ -6,7 +6,7 @@ dontPatchELF=1
sourceRoot=.
installPhase() {
ensureDir $out/lib/mozilla/plugins
mkdir -p $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
}

2
pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
View File

@ -22,7 +22,7 @@ rec {
'') ["doUnpack" "minInit"];
postInstall = a.fullDepEntry(''
ensureDir $out/share/${name}/plugin
mkdir -p $out/share/${name}/plugin
ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
'') ["doMakeInstall" "minInit" "defEnsureDir"];

2
pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ];
installPhase = ''
ensureDir $out/lib/mozilla/plugins
mkdir -p $out/lib/mozilla/plugins
cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins
'';

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -15,8 +15,6 @@ in
stdenv.mkDerivation rec {
name = "opera-11.51-1087";
buildNativeInputs = [ xz ];
src =
if stdenv.system == "i686-linux" then
fetchurl {

2
pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
View File

@ -46,7 +46,7 @@ rec {
};
} // (if externalPurple2 then {
postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2
mkdir -p $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; }
else {})

2
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -46,7 +46,7 @@ rec {
};
} // (if externalPurple2 then {
postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2
mkdir -p $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; }
else {})

6
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -59,14 +59,14 @@ rec {
doDeploy = a.fullDepEntry ''
TARGET_DIR="$out/share/oneteam/app"
BUILD_DIR="$PWD"
ensureDir "$TARGET_DIR"
mkdir -p "$TARGET_DIR"
cd "$TARGET_DIR"
unzip "$BUILD_DIR/oneteam.xulapp"
ensureDir "$out/bin"
mkdir -p "$out/bin"
echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam"
echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
chmod a+x "$out/bin/oneteam"
ensureDir "$out/share/doc"
mkdir -p "$out/share/doc"
cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
'' ["defEnsureDir"];

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
preInstall = "ensureDir \$out/share";
preInstall = "mkdir -p \$out/share";
postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
buildInputs = [pidgin];

6
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
View File

@ -12,7 +12,7 @@ rec {
];
preBuild = fullDepEntry (''
ensureDir $out/bin
mkdir -p $out/bin
ln -s $(which convert) $out/bin
ln -s $(which xelatex) $out/bin
ln -s $(which dvips) $out/bin
@ -26,8 +26,8 @@ rec {
'') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
postInstall = fullDepEntry (''
ensureDir $out/lib
ensureDir $out/share/pidgin-latex
mkdir -p $out/lib
mkdir -p $out/share/pidgin-latex
ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex
'') ["minInit" "defEnsureDir" "doMakeInstall"];

4
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins"
ensureDir "$PSI_PLUGINS"
mkdir -p "$PSI_PLUGINS"
ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
PSI_QT_PLUGINS="$out/share/psi"
ensureDir "$PSI_QT_PLUGINS"/crypto
mkdir -p "$PSI_QT_PLUGINS"/crypto
ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto
'';

2
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postBuild = ''
TARGET="$out/share/psi/plugins"
ensureDir "$TARGET"
mkdir -p "$TARGET"
cp gstprovider/*.so "$TARGET"/
'';

2
pkgs/applications/networking/instant-messengers/torchat/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms
ensureDir $out/lib/torchat
mkdir -p $out/lib/torchat
cp -rf * $out/lib/torchat
makeWrapper ${python}/bin/python $out/bin/torchat \
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \

2
pkgs/applications/networking/iptraf/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preConfigure = "cd src";
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp iptraf $out/bin
'';

2
pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
View File

@ -90,7 +90,7 @@ stdenv.mkDerivation {
--replace /bin/ls "$(type -tP ls)"
# Create a desktop item.
ensureDir $out/share/applications
mkdir -p $out/share/applications
cat > $out/share/applications/thunderbird.desktop <<EOF
[Desktop Entry]
Type=Application

2
pkgs/applications/networking/mumble/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional jackSupport jackaudio);
installPhase = ''
ensureDir $out
mkdir -p $out
cp -r ./release $out/bin
'';

2
pkgs/applications/networking/offrss/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "offrss-1.1";
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp offrss $out/bin
'';

2
pkgs/applications/networking/p2p/ldcpp/default.nix
View File

@ -12,7 +12,7 @@ with builderDefs;
openssl libX11 boost];
configureFlags = [];
doScons = fullDepEntry (''
ensureDir $out
mkdir -p $out
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
for i in gettext xgettext msgfmt msgcat; do

4
pkgs/applications/networking/p2p/mldonkey/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation (rec {
homepage = http://mldonkey.sourceforge.net/;
};
patches = [ ./gcc44mips64.patch ];
buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ];
configureFlags = [ "--disable-gui" ];
} // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then
@ -20,7 +22,7 @@ stdenv.mkDerivation (rec {
# Byte code compilation (the ocaml opt compiler is not supported in many platforms)
buildPhase = "make mlnet.byte";
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp mlnet.byte $out/bin/mlnet
'';

103
pkgs/applications/networking/p2p/mldonkey/gcc44mips64.patch Normal file
View File

@ -0,0 +1,103 @@
Patch fixing CryptoPP so:
- it builds properly in mips64 with gcc 4.4 (gcc 4.4 does not have the 'h' asm constraint)
- it runs properly in mips64 (where lack of templated *Precision functions gave wrong numbers).
An assertion check failed without this.
diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
index 9208e1c..6b12b0a 100644
--- a/src/utils/lib/CryptoPP.cc
+++ b/src/utils/lib/CryptoPP.cc
@@ -890,35 +890,6 @@ unsigned int Parity(unsigned long value)
return (unsigned int)value&1;
}
-unsigned int BytePrecision(unsigned long value)
-{
- unsigned int i;
- for (i=sizeof(value); i; --i)
- if (value >> (i-1)*8)
- break;
-
- return i;
-}
-
-unsigned int BitPrecision(unsigned long value)
-{
- if (!value)
- return 0;
-
- unsigned int l=0, h=8*sizeof(value);
-
- while (h-l > 1)
- {
- unsigned int t = (l+h)/2;
- if (value >> t)
- l = t;
- else
- h = t;
- }
-
- return h;
-}
-
unsigned long Crop(unsigned long value, unsigned int size)
{
if (size < 8*sizeof(value))
@@ -1880,7 +1851,10 @@ public:
#elif defined(__x86_64__)
__asm__("mulq %3" : "=d" (r.m_halfs.high), "=a" (r.m_halfs.low) : "a" (a), "rm" (b) : "cc");
#elif defined(__mips64)
- __asm__("dmultu %2,%3" : "=h" (r.m_halfs.high), "=l" (r.m_halfs.low) : "r" (a), "r" (b));
+ //typedef unsigned int uint128_t __attribute__((mode(TI)));
+ __uint128_t tmp = (__uint128_t) a * b;
+ r.m_halfs.high = tmp >> 64;
+ r.m_halfs.low = tmp;
#elif defined(_M_IX86)
// for testing
word64 t = (word64)a * b;
diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
index d2ec1b2..775a898 100644
--- a/src/utils/lib/CryptoPP.h
+++ b/src/utils/lib/CryptoPP.h
@@ -1869,10 +1869,39 @@ template <class T> inline const T& STDMAX(const T& a, const T& b)
// #define GETBYTE(x, y) (((byte *)&(x))[y])
CRYPTOPP_DLL unsigned int Parity(unsigned long);
-CRYPTOPP_DLL unsigned int BytePrecision(unsigned long);
-CRYPTOPP_DLL unsigned int BitPrecision(unsigned long);
CRYPTOPP_DLL unsigned long Crop(unsigned long, unsigned int size);
+template <typename T>
+unsigned int BitPrecision(const T &value)
+{
+ if (!value)
+ return 0;
+
+ unsigned int l=0, h=8*sizeof(value);
+
+ while (h-l > 1)
+ {
+ unsigned int t = (l+h)/2;
+ if (value >> t)
+ l = t;
+ else
+ h = t;
+ }
+
+ return h;
+}
+
+template <typename T>
+unsigned int BytePrecision(const T &value)
+{
+ unsigned int i;
+ for (i=sizeof(value); i; --i)
+ if (value >> (i-1)*8)
+ break;
+
+ return i;
+}
+
inline unsigned int BitsToBytes(unsigned int bitCount)
{
return ((bitCount+7)/(8));

2
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
pythonPath =
[ pythonPackages.wxPython pythonPackages.ssl pythonPackages.curses pythonPackages.apsw
[ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw
pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3
];

4
pkgs/applications/networking/pjsip/default.nix
View File

@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl libsamplerate ];
postInstall = ''
ensureDir $out/bin
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
ensureDir $out/share/${name}/samples
mkdir -p $out/share/${name}/samples
cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
'';

4
pkgs/applications/networking/skype/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
phases = "unpackPhase installPhase";
installPhase = ''
ensureDir $out/{opt/skype/,bin}
mkdir -p $out/{opt/skype/,bin}
cp -r * $out/opt/skype/
fullPath=
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
---
> Icon=$out/opt/skype/icons/SkypeBlue_48x48.png
EOF
ensureDir $out/share/applications
mkdir -p $out/share/applications
mv skype.desktop $out/share/applications
'';

2
pkgs/applications/networking/sync/unison/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation (rec {
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
+ (if ! nativeCode then " NATIVE=false" else "");
preInstall = "ensureDir $out/bin";
preInstall = "mkdir -p $out/bin";
postInstall = if enableX11 then ''
for i in $(cd $out/bin && ls); do

2
pkgs/applications/networking/vnstat/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
ensureDir $out/{bin,sbin} $out/share/man/{man1,man5}
mkdir -p $out/{bin,sbin} $out/share/man/{man1,man5}
cp src/vnstat $out/bin
cp src/vnstatd $out/sbin
cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1

2
pkgs/applications/office/impressive/default.nix
View File

@ -25,7 +25,7 @@ in
'';
installPhase = ''
ensureDir "$out/bin" "$out/share/doc/impressive"
mkdir -p "$out/bin" "$out/share/doc/impressive"
mv impressive.py "$out/bin/impressive"
mv * "$out/share/doc/impressive"

2
pkgs/applications/office/mmex/default.nix
View File

@ -19,7 +19,7 @@ in
'';
installPhase = ''
ensureDir $out/opt/mmex
mkdir -p $out/opt/mmex
cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex
'';

4
pkgs/applications/office/openoffice/builder.sh
View File

@ -70,7 +70,7 @@ installPhase() {
-f openoffice.lst -l en-US -p OpenOffice \
-buildid $BUILD -simple $ooFiles)
ensureDir $out/bin
mkdir -p $out/bin
for i in soffice ooffice; do wrapSOffice $i; done
# Create some wrappers to start individual OpenOffice components.
@ -78,7 +78,7 @@ installPhase() {
# Create symlinks to desktop files, so that openoffice.org apps can be picked from
# the application menu in KDE and GNOME
ensureDir $out/share
mkdir -p $out/share
ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications
# Apply a minor correction to the *.desktop files in order to correctly address the icons

Some files were not shown because too many files have changed in this diff Show More