mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 08:39:08 +03:00
Merge 'staging' into master
This commit is contained in:
Vladimír Čunát
commit
52d9c93abe
@ -67,7 +67,7 @@ in rec {
|
||||
|
||||
# Generate the HTML manual.
|
||||
dst=$out/share/doc/nixos
|
||||
ensureDir $dst
|
||||
mkdir -p $dst
|
||||
xsltproc $xsltFlags --nonet --xinclude \
|
||||
--output $dst/manual.html \
|
||||
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
|
||||
|
||||
@ -78,7 +78,7 @@ done
|
||||
cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
|
||||
|
||||
|
||||
ensureDir $out/iso
|
||||
mkdir -p $out/iso
|
||||
genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}"
|
||||
if test -z "$compressImage"; then
|
||||
$genCommand -o $out/iso/$isoName
|
||||
@ -87,5 +87,5 @@ else
|
||||
fi
|
||||
|
||||
|
||||
ensureDir $out/nix-support
|
||||
mkdir -p $out/nix-support
|
||||
echo $system > $out/nix-support/system
|
||||
|
||||
@ -48,11 +48,11 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
|
||||
fi
|
||||
done
|
||||
|
||||
ensureDir $out/tarball
|
||||
mkdir -p $out/tarball
|
||||
|
||||
tar cvJf $out/tarball/$fileName.tar.xz *
|
||||
|
||||
ensureDir $out/nix-support
|
||||
mkdir -p $out/nix-support
|
||||
echo $system > $out/nix-support/system
|
||||
echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
phases = [ "installPhase" ];
|
||||
buildInputs = [ jdk ];
|
||||
installPhase = ''
|
||||
ensureDir $out/lib
|
||||
mkdir -p $out/lib
|
||||
source ${activemq}/lib/classpath.env
|
||||
export CLASSPATH
|
||||
ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java
|
||||
|
||||
@ -4,9 +4,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
gnome3 = config.environment.gnome3.packageSet;
|
||||
in
|
||||
{
|
||||
|
||||
###### interface
|
||||
@ -33,9 +30,9 @@ in
|
||||
|
||||
config = mkIf config.services.gnome3.at-spi2-core.enable {
|
||||
|
||||
environment.systemPackages = [ gnome3.at_spi2_core ];
|
||||
environment.systemPackages = [ pkgs.at_spi2_core ];
|
||||
|
||||
services.dbus.packages = [ gnome3.at_spi2_core ];
|
||||
services.dbus.packages = [ pkgs.at_spi2_core ];
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
|
||||
acpiConfDir = pkgs.runCommand "acpi-events" {}
|
||||
''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
${
|
||||
# Generate a configuration file for each event. (You can't have
|
||||
# multiple events in one config file...)
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
nagiosObjectDefs = cfg.objectDefs;
|
||||
|
||||
nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
|
||||
"ensureDir $out; ln -s $nagiosObjectDefs $out/";
|
||||
"mkdir -p $out; ln -s $nagiosObjectDefs $out/";
|
||||
|
||||
nagiosCfgFile = pkgs.writeText "nagios.cfg"
|
||||
''
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
};
|
||||
buildInputs = [ python ];
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
# Make it work for kernels 3.x, not so different than 2.6
|
||||
sed -i 's/2\.6/4.0/' system_health.py
|
||||
cp system_health.py $out/bin
|
||||
|
||||
@ -11,7 +11,7 @@ let
|
||||
};
|
||||
|
||||
afsConfig = pkgs.runCommand "afsconfig" {} ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
echo ${cfg.cellName} > $out/ThisCell
|
||||
cp ${cellServDB} $out/CellServDB
|
||||
echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo
|
||||
|
||||
@ -3,7 +3,7 @@ source $stdenv/setup
|
||||
doSub() {
|
||||
local src=$1
|
||||
local dst=$2
|
||||
ensureDir $(dirname $dst)
|
||||
mkdir -p $(dirname $dst)
|
||||
substituteAll $src $dst
|
||||
}
|
||||
|
||||
@ -28,4 +28,4 @@ for i in $substFiles; do
|
||||
fi
|
||||
done
|
||||
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -14,7 +14,7 @@ let
|
||||
name = "dbus-conf";
|
||||
preferLocalBuild = true;
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
|
||||
cp -v ${pkgs.dbus.daemon}/etc/dbus-1/system.conf $out/system.conf
|
||||
|
||||
|
||||
@ -80,7 +80,7 @@ let
|
||||
|
||||
# !!! should be in lib
|
||||
writeTextInDir = name: text:
|
||||
pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
|
||||
pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name";
|
||||
|
||||
|
||||
enableSSL = any (vhost: vhost.enableSSL) allHosts;
|
||||
@ -194,7 +194,7 @@ let
|
||||
) null ([ cfg ] ++ subservices);
|
||||
|
||||
documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
|
||||
pkgs.runCommand "empty" {} "ensureDir $out";
|
||||
pkgs.runCommand "empty" {} "mkdir -p $out";
|
||||
|
||||
documentRootConf = ''
|
||||
DocumentRoot "${documentRoot}"
|
||||
|
||||
@ -92,7 +92,7 @@ let
|
||||
|
||||
installPhase =
|
||||
''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
cp -r * $out
|
||||
cp ${mediawikiConfig} $out/LocalSettings.php
|
||||
sed -i \
|
||||
@ -106,7 +106,7 @@ let
|
||||
mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts"
|
||||
{ buildInputs = [ pkgs.makeWrapper ]; }
|
||||
''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do
|
||||
makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
|
||||
--add-flags ${mediawikiRoot}/maintenance/$i
|
||||
|
||||
@ -9,7 +9,7 @@ let
|
||||
cgi = pkgs.stdenv.mkDerivation {
|
||||
name = "mercurial-cgi";
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out
|
||||
sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi
|
||||
echo "
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
buildInputs = [ pkgs.makeWrapper ];
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/gtk-3.0/
|
||||
mkdir -p $out/gtk-3.0/
|
||||
|
||||
# This wrapper ensures that we actually get fonts
|
||||
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
|
||||
|
||||
@ -27,7 +27,7 @@ let
|
||||
unpackedTheme = pkgs.stdenv.mkDerivation {
|
||||
name = "slim-theme";
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
unpackFile ${cfg.theme}
|
||||
ln -s * default
|
||||
|
||||
@ -119,7 +119,7 @@ let
|
||||
udevRules = pkgs.stdenv.mkDerivation {
|
||||
name = "udev-rules";
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
|
||||
echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ source $stdenv/setup
|
||||
ttys=($ttys)
|
||||
themes=($themes)
|
||||
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
|
||||
defaultName=$(cd $default && ls | grep -v default)
|
||||
echo $defaultName
|
||||
|
||||
@ -376,7 +376,7 @@ in
|
||||
|
||||
system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
|
||||
''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
ln -s ${config.system.build.toplevel} $out/system
|
||||
ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
|
||||
'';
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
|
||||
doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
|
||||
#doCheck = true; # takes lots of time
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://xiph.org/flac/;
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ensureDir "$out"
|
||||
mkdir -p "$out"
|
||||
scons \
|
||||
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
|
||||
$sconsFlags "prefix=$out"
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp praat $out/bin
|
||||
'';
|
||||
|
||||
|
||||
@ -43,8 +43,8 @@ in stdenv.mkDerivation rec {
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/share/atom
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/share/atom
|
||||
mkdir -p $out/bin
|
||||
tar -C $out/share/atom -xvf $src
|
||||
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
$out/share/atom/atom
|
||||
|
||||
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
ensureDir $out/share/man/man1
|
||||
ensureDir $out/share/man/man5
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man1
|
||||
mkdir -p $out/share/man/man5
|
||||
|
||||
cp dhex $out/bin
|
||||
cp dhex.1 $out/share/man/man1
|
||||
|
||||
@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase =
|
||||
''
|
||||
ensureDir "$out/share/doc/${name}"
|
||||
mkdir -p "$out/share/doc/${name}"
|
||||
cp -v readme.md "$out/share/doc/${name}"
|
||||
|
||||
ensureDir "$out/share/emacs/site-lisp/"
|
||||
mkdir -p "$out/share/emacs/site-lisp/"
|
||||
cp *.el "$out/share/emacs/site-lisp/"
|
||||
'';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
installPhase = ''
|
||||
cd emacs;
|
||||
ensureDir "$out/share/emacs/site-lisp" "$out/bin"
|
||||
mkdir -p "$out/share/emacs/site-lisp" "$out/bin"
|
||||
EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags
|
||||
'';
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ in stdenv.mkDerivation {
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/share/emacs/site-lisp"
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp *.el *.elc "$out/share/emacs/site-lisp"
|
||||
'';
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@ in mkDerivation rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ensureDir $out/Applications
|
||||
mkdir -p $out/Applications
|
||||
cp -r src/MacVim/build/Release/MacVim.app $out/Applications
|
||||
|
||||
rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view}
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin $out/share
|
||||
mkdir -p $out/bin $out/share
|
||||
cp -a . $out/share/alchemy
|
||||
cat >> $out/bin/alchemy << EOF
|
||||
#!/bin/sh
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp bin/* $out/bin
|
||||
'';
|
||||
|
||||
|
||||
@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/bin"
|
||||
mkdir -p "$out/bin"
|
||||
echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass
|
||||
chmod +x $out/bin/keepass
|
||||
echo $out
|
||||
cp -r ./* $out/
|
||||
ensureDir "$out/share/applications"
|
||||
mkdir -p "$out/share/applications"
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin $out/share
|
||||
mkdir -p $out/bin $out/share
|
||||
cp -R unix/librecad $out/bin
|
||||
cp -R unix/resources $out/share/librecad
|
||||
'';
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
configurePhase = "qmake PREFIX=$out";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin $out/share
|
||||
mkdir -p $out/bin $out/share
|
||||
cp -R unix/librecad $out/bin
|
||||
cp -R unix/resources $out/share/librecad
|
||||
'';
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
# http://synergy-foss.org/spit/issues/details/3317/
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp ../bin/synergyc $out/bin
|
||||
cp ../bin/synergys $out/bin
|
||||
cp ../bin/synergyd $out/bin
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ openssl pcre ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp vanitygen $out/bin
|
||||
cp keyconv $out/bin/vanitygen-keyconv
|
||||
'';
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ patchelf ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/bin/"
|
||||
mkdir -p "$out/bin/"
|
||||
cp -r "btsync" "$out/bin/"
|
||||
|
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
|
||||
@ -8,7 +8,7 @@ mkChromiumDerivation (base: rec {
|
||||
buildTargets = [ "mksnapshot" "chrome" ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$libExecPath"
|
||||
mkdir -p "$libExecPath"
|
||||
cp -v "$buildPath/"*.pak "$libExecPath/"
|
||||
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
|
||||
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
|
||||
|
||||
@ -67,7 +67,7 @@ in stdenv.mkDerivation {
|
||||
browserBinary = "${chromium.browser}/libexec/chromium/chromium";
|
||||
sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
|
||||
in ''
|
||||
ensureDir "$out/bin" "$out/share/applications"
|
||||
mkdir -p "$out/bin" "$out/share/applications"
|
||||
|
||||
ln -s "${chromium.browser}/share" "$out/share"
|
||||
makeWrapper "${browserBinary}" "$out/bin/chromium" \
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
else if source.channel == "stable" then "chrome"
|
||||
else "chrome-${source.channel}";
|
||||
in ''
|
||||
ensureDir plugins
|
||||
mkdir -p plugins
|
||||
ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
|
||||
./opt/google/${chan}/PepperFlash \
|
||||
./opt/google/${chan}/libpdf.so
|
||||
@ -53,7 +53,7 @@ let
|
||||
pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
|
||||
in ''
|
||||
install -vD libpdf.so "$pdf/lib/libpdf.so"
|
||||
ensureDir "$pdf/nix-support"
|
||||
mkdir -p "$pdf/nix-support"
|
||||
echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
|
||||
> "$pdf/nix-support/chromium-flags"
|
||||
|
||||
@ -63,7 +63,7 @@ let
|
||||
|
||||
install -vD PepperFlash/libpepflashplayer.so \
|
||||
"$flash/lib/libpepflashplayer.so"
|
||||
ensureDir "$flash/nix-support"
|
||||
mkdir -p "$flash/nix-support"
|
||||
echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
|
||||
"--ppapi-flash-version=$flashVersion" \
|
||||
> "$flash/nix-support/chromium-flags"
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputs = [ "out" "sandbox" "bundled" "main" ];
|
||||
installPhase = ''
|
||||
ensureDir "$out" "$sandbox" "$bundled" "$main"
|
||||
mkdir -p "$out" "$sandbox" "$bundled" "$main"
|
||||
|
||||
header "copying browser main sources to $main"
|
||||
find . -mindepth 1 -maxdepth 1 \
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/bin/" "$out/share/applications"
|
||||
mkdir -p "$out/bin/" "$out/share/applications"
|
||||
cp data/dropbox.desktop "$out/share/applications"
|
||||
substitute "dropbox.in" "$out/bin/dropbox" \
|
||||
--replace '@PACKAGE_VERSION@' ${version} \
|
||||
|
||||
@ -70,9 +70,9 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/${appdir}"
|
||||
mkdir -p "$out/${appdir}"
|
||||
cp -r ".dropbox-dist/"* "$out/${appdir}/"
|
||||
ensureDir "$out/bin"
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
|
||||
@ -83,7 +83,7 @@ in stdenv.mkDerivation {
|
||||
find "$out/${appdir}" -type f -a -perm +0100 \
|
||||
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
|
||||
|
||||
ensureDir "$out/share/applications"
|
||||
mkdir -p "$out/share/applications"
|
||||
cp "${desktopItem}/share/applications/"* $out/share/applications
|
||||
'';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
buildPhase = "make libskype.so libskype_dbus.so";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
|
||||
mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
|
||||
cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16
|
||||
cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22
|
||||
cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/lib/irssi/modules
|
||||
mkdir -p $out/lib/irssi/modules
|
||||
cp src/.libs/libfish.so $out/lib/irssi/modules
|
||||
'';
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation {
|
||||
buildPhase = "ant package-only";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/share/freenet $out/bin
|
||||
mkdir -p $out/share/freenet $out/bin
|
||||
cp lib/bcprov.jar $out/share/freenet
|
||||
cp lib/freenet/freenet-ext.jar $out/share/freenet
|
||||
cp dist/freenet.jar $out/share/freenet
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp -r ./bin $out
|
||||
'';
|
||||
|
||||
|
||||
@ -23,10 +23,10 @@ stdenv.mkDerivation {
|
||||
|
||||
inherit bash xulrunner;
|
||||
installPhase = ''
|
||||
ensureDir "$out/libexec/zotero"
|
||||
mkdir -p "$out/libexec/zotero"
|
||||
cp -vR * "$out/libexec/zotero/"
|
||||
|
||||
ensureDir "$out/bin"
|
||||
mkdir -p "$out/bin"
|
||||
substituteAll "${./zotero.sh}" "$out/bin/zotero"
|
||||
chmod +x "$out/bin/zotero"
|
||||
'';
|
||||
|
||||
@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
rsync -av bin/* $out/bin/
|
||||
|
||||
ensureDir $out/share/emacs/site-lisp/twelf/
|
||||
mkdir -p $out/share/emacs/site-lisp/twelf/
|
||||
rsync -av emacs/ $out/share/emacs/site-lisp/twelf/
|
||||
|
||||
ensureDir $out/share/twelf/examples
|
||||
mkdir -p $out/share/twelf/examples
|
||||
rsync -av examples/ $out/share/twelf/examples/
|
||||
ensureDir $out/share/twelf/vim
|
||||
mkdir -p $out/share/twelf/vim
|
||||
rsync -av vim/ $out/share/twelf/vim/
|
||||
'';
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ rec {
|
||||
phaseNames = ["doConfigure" "doMake" "doDeploy"];
|
||||
|
||||
doDeploy = a.fullDepEntry ''
|
||||
ensureDir "$out/bin" "$out/share/gap/"
|
||||
mkdir -p "$out/bin" "$out/share/gap/"
|
||||
|
||||
cp -r . "$out/share/gap/build-dir"
|
||||
|
||||
|
||||
@ -21,8 +21,8 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out
|
||||
mkdir -p $out/bin
|
||||
cp git-bz $out/bin
|
||||
wrapProgram $out/bin/git-bz \
|
||||
--prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp svn-all-fast-export $out/bin
|
||||
'';
|
||||
|
||||
|
||||
@ -30,9 +30,9 @@ for i in ${bin} ; do
|
||||
${i}
|
||||
done
|
||||
|
||||
ensureDir $out/bin
|
||||
ensureDir $out/lib
|
||||
ensureDir $out/share/MakeMKV
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/share/MakeMKV
|
||||
cp ${lib} ${out}/lib
|
||||
cp ${bin} ${out}/bin
|
||||
cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV
|
||||
|
||||
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
|
||||
'';
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp omxplayer.bin $out/bin
|
||||
'';
|
||||
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
|
||||
|
||||
@ -248,12 +248,12 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
|
||||
|
||||
./Setup copy
|
||||
|
||||
ensureDir $out/bin # necessary to get it added to PATH
|
||||
mkdir -p $out/bin # necessary to get it added to PATH
|
||||
|
||||
local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
|
||||
local installedPkgConf=$confDir/${self.fname}.installedconf
|
||||
local pkgConf=$confDir/${self.fname}.conf
|
||||
ensureDir $confDir
|
||||
mkdir -p $confDir
|
||||
./Setup register --gen-pkg-config=$pkgConf
|
||||
if test -f $pkgConf; then
|
||||
echo '[]' > $installedPkgConf
|
||||
@ -265,7 +265,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
|
||||
fi
|
||||
|
||||
${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) ''
|
||||
for exe in $out/bin/* ; do
|
||||
for exe in "$out/bin/"* ; do
|
||||
install_name_tool -add_rpath \
|
||||
$out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe
|
||||
done
|
||||
|
||||
@ -21,4 +21,4 @@ if test -e @out@/nix-support/libc-ldflags-before; then
|
||||
export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
|
||||
fi
|
||||
|
||||
export NIX_CLANG_WRAPPER_FLAGS_SET=1
|
||||
export NIX_GCC_WRAPPER_FLAGS_SET=1
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
#! @shell@ -e
|
||||
|
||||
if test -n "$NIX_CLANG_WRAPPER_START_HOOK"; then
|
||||
source "$NIX_CLANG_WRAPPER_START_HOOK"
|
||||
if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
|
||||
source "$NIX_GCC_WRAPPER_START_HOOK"
|
||||
fi
|
||||
|
||||
if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then
|
||||
if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
|
||||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@ stdenv.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
setupHook = ./setup-hook.sh;
|
||||
clangWrapper = ./clang-wrapper.sh;
|
||||
ldWrapper = ./ld-wrapper.sh;
|
||||
utils = ./utils.sh;
|
||||
ldWrapper = ../gcc-wrapper/ld-wrapper.sh;
|
||||
utils = ../gcc-wrapper/utils.sh;
|
||||
addFlags = ./add-flags;
|
||||
|
||||
inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx;
|
||||
|
||||
@ -1,164 +0,0 @@
|
||||
#! @shell@ -e
|
||||
|
||||
if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
|
||||
source "$NIX_LD_WRAPPER_START_HOOK"
|
||||
fi
|
||||
|
||||
if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then
|
||||
source @out@/nix-support/add-flags.sh
|
||||
fi
|
||||
|
||||
source @out@/nix-support/utils.sh
|
||||
|
||||
|
||||
# Optionally filter out paths not refering to the store.
|
||||
params=("$@")
|
||||
if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
|
||||
-a \( -z "$NIX_IGNORE_LD_THROUGH_CLANG" -o -z "$NIX_LDFLAGS_SET" \); then
|
||||
rest=()
|
||||
n=0
|
||||
while test $n -lt ${#params[*]}; do
|
||||
p=${params[n]}
|
||||
p2=${params[$((n+1))]}
|
||||
if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
|
||||
skip $p
|
||||
elif test "$p" = "-L" && badPath "$p2"; then
|
||||
n=$((n + 1)); skip $p2
|
||||
elif test "$p" = "-rpath" && badPath "$p2"; then
|
||||
n=$((n + 1)); skip $p2
|
||||
elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
|
||||
n=$((n + 1)); skip $p2
|
||||
elif test "${p:0:1}" = "/" && badPath "$p"; then
|
||||
# We cannot skip this; barf.
|
||||
echo "impure path \`$p' used in link" >&2
|
||||
exit 1
|
||||
elif test "${p:0:9}" = "--sysroot"; then
|
||||
# Our ld is not built with sysroot support (Can we fix that?)
|
||||
:
|
||||
else
|
||||
rest=("${rest[@]}" "$p")
|
||||
fi
|
||||
n=$((n + 1))
|
||||
done
|
||||
params=("${rest[@]}")
|
||||
fi
|
||||
|
||||
|
||||
extra=()
|
||||
extraBefore=()
|
||||
|
||||
if test -z "$NIX_LDFLAGS_SET"; then
|
||||
extra=(${extra[@]} $NIX_LDFLAGS)
|
||||
extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
|
||||
fi
|
||||
|
||||
|
||||
# Add all used dynamic libraries to the rpath.
|
||||
if test "$NIX_DONT_SET_RPATH" != "1"; then
|
||||
|
||||
libPath=""
|
||||
addToLibPath() {
|
||||
local path="$1"
|
||||
if test "${path:0:1}" != "/"; then return 0; fi
|
||||
case "$path" in
|
||||
*..*|*./*|*/.*|*//*)
|
||||
local path2
|
||||
if path2=$(readlink -f "$path"); then
|
||||
path="$path2"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
case $libPath in
|
||||
*\ $path\ *) return 0 ;;
|
||||
esac
|
||||
libPath="$libPath $path "
|
||||
}
|
||||
|
||||
addToRPath() {
|
||||
# If the path is not in the store, don't add it to the rpath.
|
||||
# This typically happens for libraries in /tmp that are later
|
||||
# copied to $out/lib. If not, we're screwed.
|
||||
if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
|
||||
case $rpath in
|
||||
*\ $1\ *) return 0 ;;
|
||||
esac
|
||||
rpath="$rpath $1 "
|
||||
}
|
||||
|
||||
libs=""
|
||||
addToLibs() {
|
||||
libs="$libs $1"
|
||||
}
|
||||
|
||||
rpath=""
|
||||
|
||||
# First, find all -L... switches.
|
||||
allParams=("${params[@]}" ${extra[@]})
|
||||
n=0
|
||||
while test $n -lt ${#allParams[*]}; do
|
||||
p=${allParams[n]}
|
||||
p2=${allParams[$((n+1))]}
|
||||
if test "${p:0:3}" = "-L/"; then
|
||||
addToLibPath ${p:2}
|
||||
elif test "$p" = "-L"; then
|
||||
addToLibPath ${p2}
|
||||
n=$((n + 1))
|
||||
elif test "$p" = "-l"; then
|
||||
addToLibs ${p2}
|
||||
n=$((n + 1))
|
||||
elif test "${p:0:2}" = "-l"; then
|
||||
addToLibs ${p:2}
|
||||
elif test "$p" = "-dynamic-linker"; then
|
||||
# Ignore the dynamic linker argument, or it
|
||||
# will get into the next 'elif'. We don't want
|
||||
# the dynamic linker path rpath to go always first.
|
||||
n=$((n + 1))
|
||||
elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then
|
||||
# This is a direct reference to a shared library, so add
|
||||
# its directory to the rpath.
|
||||
path="$(dirname "$p")";
|
||||
addToRPath "${path}"
|
||||
fi
|
||||
n=$((n + 1))
|
||||
done
|
||||
|
||||
# Second, for each directory in the library search path (-L...),
|
||||
# see if it contains a dynamic library used by a -l... flag. If
|
||||
# so, add the directory to the rpath.
|
||||
# It's important to add the rpath in the order of -L..., so
|
||||
# the link time chosen objects will be those of runtime linking.
|
||||
|
||||
for i in $libPath; do
|
||||
for j in $libs; do
|
||||
if test -f "$i/lib$j.so"; then
|
||||
addToRPath $i
|
||||
break
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
|
||||
# Finally, add `-rpath' switches.
|
||||
for i in $rpath; do
|
||||
extra=(${extra[@]} -rpath $i)
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Optionally print debug info.
|
||||
if test "$NIX_DEBUG" = "1"; then
|
||||
echo "original flags to @ld@:" >&2
|
||||
for i in "${params[@]}"; do
|
||||
echo " $i" >&2
|
||||
done
|
||||
echo "extra flags to @ld@:" >&2
|
||||
for i in ${extra[@]}; do
|
||||
echo " $i" >&2
|
||||
done
|
||||
fi
|
||||
|
||||
if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
|
||||
source "$NIX_LD_WRAPPER_EXEC_HOOK"
|
||||
fi
|
||||
|
||||
exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
|
||||
@ -1,24 +0,0 @@
|
||||
skip () {
|
||||
if test "$NIX_DEBUG" = "1"; then
|
||||
echo "skipping impure path $1" >&2
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
|
||||
# `/nix/store/.../lib/foo.so' isn't.
|
||||
badPath() {
|
||||
local p=$1
|
||||
|
||||
# Relative paths are okay (since they're presumably relative to
|
||||
# the temporary build directory).
|
||||
if test "${p:0:1}" != "/"; then return 1; fi
|
||||
|
||||
# Otherwise, the path should refer to the store or some temporary
|
||||
# directory (including the build directory).
|
||||
test \
|
||||
"$p" != "/dev/null" -a \
|
||||
"${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
|
||||
"${p:0:4}" != "/tmp" -a \
|
||||
"${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
|
||||
}
|
||||
@ -77,6 +77,7 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
|
||||
n=$((n + 1))
|
||||
done
|
||||
params=("${rest[@]}")
|
||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
|
||||
# We cannot skip this; barf.
|
||||
echo "impure path \`$p' used in link" >&2
|
||||
exit 1
|
||||
elif test "${p:0:9}" = "--sysroot"; then
|
||||
# Our ld is not built with sysroot support (Can we fix that?)
|
||||
:
|
||||
else
|
||||
rest=("${rest[@]}" "$p")
|
||||
fi
|
||||
@ -45,10 +48,12 @@ extra=()
|
||||
extraBefore=()
|
||||
|
||||
if test -z "$NIX_LDFLAGS_SET"; then
|
||||
extra=(${extra[@]} $NIX_LDFLAGS)
|
||||
extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
|
||||
extra+=($NIX_LDFLAGS)
|
||||
extraBefore+=($NIX_LDFLAGS_BEFORE)
|
||||
fi
|
||||
|
||||
extra+=($NIX_LDFLAGS_AFTER)
|
||||
|
||||
|
||||
# Add all used dynamic libraries to the rpath.
|
||||
if test "$NIX_DONT_SET_RPATH" != "1"; then
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
inherit libs;
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
|
||||
KDEDIRS=${program}
|
||||
QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
priority = 5;
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out/share/autostart
|
||||
mkdir -p $out/share/autostart
|
||||
target=${name}.desktop
|
||||
cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
|
||||
chmod +rw $target
|
||||
|
||||
@ -9,6 +9,6 @@ findTarballs() {
|
||||
}
|
||||
|
||||
propagateImageName() {
|
||||
ensureDir $out/nix-support
|
||||
mkdir -p $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ in rec {
|
||||
-b "${installedVM}/disk.img" \
|
||||
-f qcow2 winvm.img
|
||||
${runAndSuspend}
|
||||
ensureDir "$out"
|
||||
mkdir -p "$out"
|
||||
cp winvm.img "$out/disk.img"
|
||||
cp state.gz "$out/state.gz"
|
||||
'';
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
cygwinSshKey = stdenv.mkDerivation {
|
||||
name = "snakeoil-ssh-cygwin";
|
||||
buildCommand = ''
|
||||
ensureDir "$out"
|
||||
mkdir -p "$out"
|
||||
${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N ""
|
||||
'';
|
||||
};
|
||||
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
|
||||
buildCommand = ''
|
||||
${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G
|
||||
${installController}
|
||||
ensureDir "$out"
|
||||
mkdir -p "$out"
|
||||
cp winvm.img "$out/disk.img"
|
||||
'';
|
||||
passthru = {
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
ln -s . $out/share/zoneinfo/posix
|
||||
mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
|
||||
|
||||
ensureDir "$lib/include"
|
||||
mkdir -p "$lib/include"
|
||||
cp tzfile.h "$lib/include/tzfile.h"
|
||||
'';
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enlightenment-${version}";
|
||||
version = "0.18.8";
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi
|
||||
, intltool, dbus_glib, at_spi2_core, libSM }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
versionMajor = "2.12";
|
||||
versionMinor = "0";
|
||||
moduleName = "at-spi2-atk";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
|
||||
};
|
||||
|
||||
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
|
||||
intltool dbus_glib at_spi2_core libSM ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
|
||||
, libxklavier, libXtst, gtk2, intltool, libxslt }:
|
||||
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
|
||||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
|
||||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
|
||||
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
|
||||
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
|
||||
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
|
||||
|
||||
@ -10,10 +10,6 @@ rec {
|
||||
|
||||
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
|
||||
|
||||
at_spi2_atk = callPackage ./core/at-spi2-atk { };
|
||||
|
||||
at_spi2_core = callPackage ./core/at-spi2-core { };
|
||||
|
||||
baobab = callPackage ./core/baobab { };
|
||||
|
||||
caribou = callPackage ./core/caribou { };
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
|
||||
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
versionMajor = "2.12";
|
||||
versionMinor = "0";
|
||||
moduleName = "at-spi2-core";
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python pkgconfig popt intltool dbus_glib
|
||||
libX11 xextproto libSM libICE libXtst libXi
|
||||
gobjectIntrospection
|
||||
];
|
||||
|
||||
# ToDo: on non-NixOS we create a symlink from there?
|
||||
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
// stdenv.lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_LDFLAGS = "-lintl";
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
|
||||
, libxklavier, libXtst, gtk2, intltool, libxslt }:
|
||||
, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
|
||||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
|
||||
, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
|
||||
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
|
||||
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
|
||||
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
|
||||
|
||||
@ -16,10 +16,6 @@ rec {
|
||||
|
||||
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
|
||||
|
||||
at_spi2_atk = callPackage ./core/at-spi2-atk { };
|
||||
|
||||
at_spi2_core = callPackage ./core/at-spi2-core { };
|
||||
|
||||
baobab = callPackage ./core/baobab { };
|
||||
|
||||
caribou = callPackage ./core/caribou { };
|
||||
|
||||
@ -44,4 +44,6 @@ stdenv.mkDerivation rec {
|
||||
langC = true;
|
||||
|
||||
buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ];
|
||||
|
||||
meta.broken = true;
|
||||
}
|
||||
|
||||
@ -109,13 +109,11 @@ if test "$noSysDirs" = "1"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
|
||||
# the startfiles.
|
||||
# FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
|
||||
# for the startfiles.
|
||||
makeFlagsArray=( \
|
||||
"${makeFlagsArray[@]}" \
|
||||
makeFlagsArray+=( \
|
||||
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
||||
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
||||
CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
|
||||
@ -128,8 +126,7 @@ if test "$noSysDirs" = "1"; then
|
||||
)
|
||||
|
||||
if test -z "$targetConfig"; then
|
||||
makeFlagsArray=( \
|
||||
"${makeFlagsArray[@]}" \
|
||||
makeFlagsArray+=( \
|
||||
BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
|
||||
BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
|
||||
)
|
||||
@ -138,13 +135,11 @@ if test "$noSysDirs" = "1"; then
|
||||
if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
|
||||
# We don't want the gcc build to assume there will be a libc providing
|
||||
# limits.h in this stagae
|
||||
makeFlagsArray=( \
|
||||
"${makeFlagsArray[@]}" \
|
||||
makeFlagsArray+=( \
|
||||
LIMITS_H_TEST=false \
|
||||
)
|
||||
else
|
||||
makeFlagsArray=( \
|
||||
"${makeFlagsArray[@]}" \
|
||||
makeFlagsArray+=( \
|
||||
LIMITS_H_TEST=true \
|
||||
)
|
||||
fi
|
||||
@ -163,6 +158,7 @@ preConfigure() {
|
||||
# Patch to get armvt5el working:
|
||||
sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
|
||||
fi
|
||||
|
||||
# Bug - they packaged zlib
|
||||
if test -d "zlib"; then
|
||||
# This breaks the build without-headers, which should build only
|
||||
@ -189,8 +185,8 @@ preConfigure() {
|
||||
fi
|
||||
|
||||
# Eval the preConfigure script from nix expression.
|
||||
eval $providedPreConfigure;
|
||||
env;
|
||||
eval "$providedPreConfigure"
|
||||
|
||||
# Perform the build in a different directory.
|
||||
mkdir ../build
|
||||
cd ../build
|
||||
@ -204,6 +200,15 @@ postConfigure() {
|
||||
}
|
||||
|
||||
|
||||
preInstall() {
|
||||
# Make ‘lib64’ a symlink to ‘lib’.
|
||||
if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
|
||||
mkdir -p $out/lib
|
||||
ln -s lib $out/lib64
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
postInstall() {
|
||||
# Remove precompiled headers for now. They are very big and
|
||||
# probably not very useful yet.
|
||||
|
||||
@ -67,7 +67,6 @@ let version = "4.8.3";
|
||||
patches = []
|
||||
++ optional enableParallelBuilding ./parallel-bconfig.patch
|
||||
++ optional (cross != null) ./libstdc++-target.patch
|
||||
# ++ optional noSysDirs ./no-sys-dirs.patch
|
||||
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
|
||||
# target libraries and tools.
|
||||
++ optional langAda ./gnat-cflags.patch
|
||||
@ -304,14 +303,21 @@ stdenv.mkDerivation ({
|
||||
"\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
|
||||
\"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
|
||||
);
|
||||
${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)
|
||||
''
|
||||
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
|
||||
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
|
||||
export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
|
||||
export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
|
||||
''}
|
||||
'';
|
||||
'' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
|
||||
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
|
||||
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
|
||||
export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
|
||||
export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
|
||||
configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
|
||||
makeFlagsArray+=( \
|
||||
CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
|
||||
CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
|
||||
FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
|
||||
)
|
||||
fi
|
||||
'';
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
@ -494,9 +500,11 @@ stdenv.mkDerivation ({
|
||||
else null;
|
||||
|
||||
passthru =
|
||||
{ inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo enableMultilib version; };
|
||||
{ inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; };
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
inherit enableParallelBuilding enableMultilib;
|
||||
|
||||
inherit (stdenv) is64bit;
|
||||
|
||||
meta = {
|
||||
homepage = http://gcc.gnu.org/;
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
|
||||
--- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200
|
||||
+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200
|
||||
@@ -41,6 +41,10 @@
|
||||
# undef CROSS_INCLUDE_DIR
|
||||
#endif
|
||||
|
||||
+#undef LOCAL_INCLUDE_DIR
|
||||
+#undef SYSTEM_INCLUDE_DIR
|
||||
+#undef STANDARD_INCLUDE_DIR
|
||||
+
|
||||
const struct default_include cpp_include_defaults[]
|
||||
#ifdef INCLUDE_DEFAULTS
|
||||
= INCLUDE_DEFAULTS;
|
||||
diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
|
||||
--- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100
|
||||
+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200
|
||||
@@ -1478,10 +1478,10 @@
|
||||
/* Default prefixes to attach to command names. */
|
||||
|
||||
#ifndef STANDARD_STARTFILE_PREFIX_1
|
||||
-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
|
||||
+#define STANDARD_STARTFILE_PREFIX_1 ""
|
||||
#endif
|
||||
#ifndef STANDARD_STARTFILE_PREFIX_2
|
||||
-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
|
||||
+#define STANDARD_STARTFILE_PREFIX_2 ""
|
||||
#endif
|
||||
|
||||
#ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */
|
||||
--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200
|
||||
+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200
|
||||
@@ -3277,7 +3281,7 @@
|
||||
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
|
||||
-DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
|
||||
-DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
|
||||
- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
|
||||
+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
|
||||
-DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
|
||||
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
|
||||
-DPREFIX=\"$(prefix)/\" \
|
||||
@ -34,14 +34,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp ghdl_mcode $out/bin
|
||||
|
||||
ensureDir $out/share/ghdl_mcode/translate
|
||||
mkdir -p $out/share/ghdl_mcode/translate
|
||||
cp -R ../lib $out/share/ghdl_mcode/translate
|
||||
cp -R ../../libraries $out/share/ghdl_mcode
|
||||
|
||||
ensureDir $out/share/man/man1
|
||||
mkdir -p $out/share/man/man1
|
||||
cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1
|
||||
|
||||
# Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
|
||||
|
||||
@ -69,7 +69,7 @@ stdenv.mkDerivation {
|
||||
# http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html
|
||||
# Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work"
|
||||
# during tests:
|
||||
export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))"
|
||||
export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib/libgcc_s.so))"
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
export GOROOT="$(pwd)/"
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
propagatedBuildInputs = [ go ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
export GOPATH=$src
|
||||
go build -v -o $out/bin/gox github.com/mitchellh/gox
|
||||
'';
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
unzip $src
|
||||
mv gwt-2.4.0 $out/bin
|
||||
'';
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
ensureDir $out/lib/mercury/cgi-bin ;
|
||||
mkdir -p $out/lib/mercury/cgi-bin ;
|
||||
configureFlags="--enable-deep-profiler=$out/lib/mercury/cgi-bin";
|
||||
'';
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
patch -p0 < ${./mips64.patch}
|
||||
'';
|
||||
postBuild = ''
|
||||
ensureDir $out/include
|
||||
mkdir -p $out/include
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
'';
|
||||
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
{ stdenv, fetchurl, setJavaClassPath }:
|
||||
{ stdenv, fetchurl, unzip, setJavaClassPath }:
|
||||
let
|
||||
jdk = stdenv.mkDerivation {
|
||||
name = "openjdk6-b16-24_apr_2009-r1";
|
||||
name = "openjdk-7u60b30";
|
||||
|
||||
# From https://github.com/alexkasko/openjdk-unofficial-builds
|
||||
src = fetchurl {
|
||||
url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
|
||||
sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
|
||||
url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip;
|
||||
sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -vR * $out/
|
||||
mv */Contents/Home $out
|
||||
|
||||
# jni.h expects jni_md.h to be in the header search path.
|
||||
ln -s $out/include/darwin/*_md.h $out/include/
|
||||
|
||||
@ -54,13 +54,13 @@ stdenv.mkDerivation rec {
|
||||
export LC_ALL=en_US.UTF-8
|
||||
|
||||
# Set up link to cymake, which has been built already.
|
||||
ensureDir bin/.local
|
||||
mkdir -p bin/.local
|
||||
ln -s ${curryFront}/bin/cymake bin/.local/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Prepare PAKCSHOME directory.
|
||||
ensureDir $out/pakcs
|
||||
mkdir -p $out/pakcs
|
||||
for d in bin curry2prolog currytools lib tools cpns include www examples docs ; do
|
||||
cp -r $d $out/pakcs ;
|
||||
done
|
||||
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
(cd $out/pakcs/www ; make)
|
||||
|
||||
# Install bin.
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
for b in makecurrycgi .makesavedstate pakcs parsecurry cleancurry \
|
||||
addtypes cass currybrowse currycreatemake currydoc currytest \
|
||||
dataToXml erd2curry ; do
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
|
||||
# Place emacs lisp files in expected locations.
|
||||
ensureDir $out/share/emacs/site-lisp/curry-pakcs
|
||||
mkdir -p $out/share/emacs/site-lisp/curry-pakcs
|
||||
for e in "tools/emacs/"*.el ; do
|
||||
cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
|
||||
done
|
||||
|
||||
@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp -p src/runtime/sbcl $out/bin
|
||||
ensureDir $out/share/sbcl
|
||||
mkdir -p $out/share/sbcl
|
||||
cp -p output/sbcl.core $out/share/sbcl
|
||||
'';
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = ''
|
||||
export INSTALL_ROOT=$out
|
||||
ensureDir test-home
|
||||
mkdir -p test-home
|
||||
export HOME=$PWD/test-home
|
||||
'';
|
||||
|
||||
|
||||
@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
rsync -av bin/ $out/bin/
|
||||
|
||||
ensureDir $out/lib
|
||||
mkdir -p $out/lib
|
||||
rsync -av lib/ $out/lib/
|
||||
'';
|
||||
|
||||
|
||||
@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
|
||||
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
|
||||
license = "EPLv1.0";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,29 +64,5 @@ stdenv.mkDerivation rec {
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# some network-related tests don't work, mostly probably due to our sandboxing
|
||||
testsToSkip = ''
|
||||
lib/Net/hostent.t \
|
||||
dist/IO/t/{io_multihomed.t,io_sock.t} \
|
||||
dist/Net-Ping/t/*.t \
|
||||
cpan/autodie/t/truncate.t \
|
||||
t/porting/{maintainers.t,regen.t} \
|
||||
cpan/Socket/t/get{name,addr}info.t \
|
||||
'' + optionalString stdenv.isFreeBSD ''
|
||||
cpan/CPANPLUS/t/04_CPANPLUS-Module.t \
|
||||
cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \
|
||||
'' + " ";
|
||||
|
||||
postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ ''
|
||||
for test in ${testsToSkip}; do
|
||||
echo "Removing test" $test
|
||||
rm "$test"
|
||||
pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes
|
||||
sed "/^$pat/d" -i MANIFEST
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.libPrefix = "lib/perl5/site_perl";
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [openssl jdk premake3];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/{bin,lib,share/${baseName}}
|
||||
mkdir -p $out/{bin,lib,share/${baseName}}
|
||||
|
||||
# Install lib
|
||||
install -Dm444 lib/linux/libaacskeys.so $out/lib
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
mv * $out/
|
||||
for j in `find $out/lib -name "*.jar"`; do
|
||||
cp="''${cp:+"$cp:"}$j";
|
||||
|
||||
@ -75,6 +75,7 @@ stdenv.mkDerivation {
|
||||
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
|
||||
rm $out/bin/bjam
|
||||
ln -s $out/bin/b2 $out/bin/bjam
|
||||
rm -rf $out/share/boost-build/example
|
||||
'';
|
||||
|
||||
crossAttrs = rec {
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
ensureDir "$out/lib/${passthru.libPrefix}"
|
||||
mkdir -p "$out/lib/${passthru.libPrefix}"
|
||||
cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}"
|
||||
'';
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ pkgconfig expat ];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--with-cache-dir=/var/cache/fontconfig"
|
||||
"--disable-docs"
|
||||
"--with-default-fonts="
|
||||
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
# Don't try to write to /var/cache/fontconfig at install time.
|
||||
installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
|
||||
installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/etc/fonts" && tar xvf ${infinality_patch}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user