Merge branch 'master' into staging

obadz 0e8d2725 13c04c83

Changed files
+765 -595
doc
languages-frameworks
lib
nixos
lib
modules
services
misc
monitoring
torrent
x11
desktop-managers
display-managers
window-managers
system
tasks
filesystems
virtualisation
tests
pkgs
applications
audio
caudec
freewheeling
mopidy
backup
areca
editors
eclipse
emacs-25
idea
music
tuxguitar
netbeans
graphics
geeqie
processing
qtpfsgui
sane
backends
misc
audio
wavesurfer
avrdudess
blender
ding
emem
finalterm
get_iplayer
llpp
pgadmin
translate-shell
webthree-umbrella
networking
browsers
chromium
firefox
qutebrowser
cluster
hadoop
kubernetes
pig
terraform
davmail
esniper
ike
instant-messengers
hipchat
jitsi
pidgin-plugins
pidgin-latex
sflphone
viber
mailreaders
mailpile
newsreaders
liferea
p2p
remote
citrix-receiver
seafile-client
office
calligra
gnucash
libreoffice
science
logic
satallax
version-management
gource
video
mkcast
shotcut
vlc
virtualization
docker
open-vm-tools
virtualbox
guest-additions
xen
window-managers
awesome
compton
stumpwm
build-support
data
fonts
cantarell-fonts
desktops
enlightenment
gnome-3
3.20
apps
evolution
gedit
gnome-boxes
core
empathy
epiphany
folks
gnome-calculator
gnome-dictionary
gnome-keyring
gnome-online-accounts
gnome-screenshot
gnome-session
gnome-settings-daemon
gnome-system-log
gnome-user-share
tracker
misc
extensions
kde-5
plasma
startkde
development
compilers
haskell-modules
interpreters
libraries
SDL
SDL2
SDL2_gfx
SDL2_image
SDL2_mixer
SDL2_net
SDL2_ttf
SDL_gfx
SDL_image
SDL_mixer
SDL_net
SDL_sound
SDL_stretch
czmq
kdevplatform
libvirt
phonon
backends
physics
geant4
science
math
clblas
wt
mobile
python-modules
libgpuarray
pycuda
ruby-modules
tools
build-managers
continuous-integration
buildkite-agent
cide
haskell
ihaskell
misc
autobuild
distcc
drush
indent
kibana
opengrok
games
0ad
armagetronad
arx-libertatis
brogue
commandergenius
crawl
dwarf-fortress
hedgewars
openmw
spring
super-tux-kart
the-powder-toy
tibia
xpilot
misc
cups
drivers
samsung
emulators
higan
retrofe
os-specific
servers
elasticmq
http
apache-modules
mod_auth_mellon
mod_fastcgi
mail
postfix
misc
taskserver
monitoring
net-snmp
nosql
neo4j
openpts
xmpp
ejabberd
tools
X11
admin
audio
backup
bareos
btrbk
duplicity
store-backup
bluetooth
blueman
cd-dvd
unetbootin
graphics
pdfread
inputmethods
fcitx-engines
fcitx-table-other
ibus
misc
disper
gparted
plowshare
profile-cleaner
networking
dhcp
lftp
mosh
network-manager-applet
offlineimap
openvpn
snabb
wicd
wrk
security
system
collectd
wsmancli
typesetting
asciidoc
djvu2pdf
docbook2odf
xmlto
video
mjpegtools
virtualization
ec2-ami-tools
top-level
+1 -1
doc/languages-frameworks/haskell.md
···
enable: true
packages: [ zlib ]
-
Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an
`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you
can achieve the same effect by hand. First of all, run
···
enable: true
packages: [ zlib ]
+
Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` as an
`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you
can achieve the same effect by hand. First of all, run
+2 -2
doc/languages-frameworks/python.md
···
# Tests cannot import pyfftw. pyfftw works fine though.
doCheck = false;
-
LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
-
CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
'';
meta = {
···
# Tests cannot import pyfftw. pyfftw works fine though.
doCheck = false;
+
LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
+
CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
'';
meta = {
+1 -1
lib/maintainers.nix
···
ericbmerritt = "Eric Merritt <eric@afiniate.com>";
ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
-
ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
exi = "Reno Reckling <nixos@reckling.org>";
exlevan = "Alexey Levan <exlevan@gmail.com>";
expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
···
ericbmerritt = "Eric Merritt <eric@afiniate.com>";
ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
+
ertes = "Ertugrul Söylemez <esz@posteo.de>";
exi = "Reno Reckling <nixos@reckling.org>";
exlevan = "Alexey Levan <exlevan@gmail.com>";
expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
+1 -1
nixos/lib/testing.nix
···
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \
-
--prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \
--prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
'';
};
···
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \
+
--prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \
--prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
'';
};
+1 -1
nixos/modules/services/misc/gitlab.nix
···
makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
--set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
-
--set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \
···
makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
--set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
+
--set PATH '${stdenv.lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \
+1 -1
nixos/modules/services/misc/nix-daemon.nix
···
description = ''
List of binary cache URLs that non-root users can use (in
addition to those specified using
-
<option>nix.binaryCaches</option> by passing
<literal>--option binary-caches</literal> to Nix commands.
'';
};
···
description = ''
List of binary cache URLs that non-root users can use (in
addition to those specified using
+
<option>nix.binaryCaches</option>) by passing
<literal>--option binary-caches</literal> to Nix commands.
'';
};
+1 -1
nixos/modules/services/monitoring/graphite.nix
···
DJANGO_SETTINGS_MODULE = "graphite.settings";
GRAPHITE_CONF_DIR = configDir;
GRAPHITE_STORAGE_DIR = dataDir;
-
LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
};
serviceConfig = {
ExecStart = ''
···
DJANGO_SETTINGS_MODULE = "graphite.settings";
GRAPHITE_CONF_DIR = configDir;
GRAPHITE_STORAGE_DIR = dataDir;
+
LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
};
serviceConfig = {
ExecStart = ''
+1 -1
nixos/modules/services/torrent/transmission.nix
···
@{PROC}/sys/kernel/random/uuid r,
@{PROC}/sys/vm/overcommit_memory r,
-
${pkgs.openssl}/etc/** r,
${pkgs.transmission}/share/transmission/** r,
owner ${settingsDir}/** rw,
···
@{PROC}/sys/kernel/random/uuid r,
@{PROC}/sys/vm/overcommit_memory r,
+
${pkgs.openssl.out}/etc/** r,
${pkgs.transmission}/share/transmission/** r,
owner ${settingsDir}/** rw,
+1 -1
nixos/modules/services/x11/desktop-managers/kde5.nix
···
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil
-
++ lib.optional config.services.colord.enable kde5.colord-kde
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
environment.pathsToLink = [ "/share" ];
···
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil
+
++ lib.optional config.services.colord.enable pkgs.colord-kde
++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
environment.pathsToLink = [ "/share" ];
+2 -1
nixos/modules/services/x11/display-managers/default.nix
···
(*) echo "$0: Desktop manager '$desktopManager' not found.";;
esac
${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''
-
${pkgs.glib}/bin/gdbus call --session \
--dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
--method org.freedesktop.DBus.UpdateActivationEnvironment \
"{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \
···
(*) echo "$0: Desktop manager '$desktopManager' not found.";;
esac
+
# FIXME: gdbus should not be in glib.dev!
${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) ''
+
${pkgs.glib.dev}/bin/gdbus call --session \
--dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \
--method org.freedesktop.DBus.UpdateActivationEnvironment \
"{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \
+2 -2
nixos/modules/services/x11/window-managers/metacity.nix
···
services.xserver.windowManager.session = singleton
{ name = "metacity";
start = ''
-
env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/
# !!! Hack: load the schemas for Metacity.
-
GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
--makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
${gnome.metacity}/bin/metacity &
waitPID=$!
···
services.xserver.windowManager.session = singleton
{ name = "metacity";
start = ''
+
env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/
# !!! Hack: load the schemas for Metacity.
+
GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf.out}/bin/gconftool-2 \
--makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
${gnome.metacity}/bin/metacity &
waitPID=$!
+7 -3
nixos/modules/system/boot/initrd-ssh.nix
···
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
'';
boot.initrd.extraUtilsCommandsTest = ''
···
touch /var/log/lastlog
mkdir -p /etc/dropbear
-
${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
-
${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
-
${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
mkdir -p /root/.ssh
${concatStrings (map (key: ''
···
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
+
+
${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"}
+
${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"}
+
${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"}
'';
boot.initrd.extraUtilsCommandsTest = ''
···
touch /var/log/lastlog
mkdir -p /etc/dropbear
+
${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"}
+
${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"}
+
${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"}
mkdir -p /root/.ssh
${concatStrings (map (key: ''
+2 -2
nixos/modules/tasks/filesystems/cifs.nix
···
{
config = {
-
system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ];
boot.initrd.availableKernelModules = mkIf inInitrd
[ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
boot.initrd.extraUtilsCommands = mkIf inInitrd
''
-
copy_bin_and_libs ${pkgs.cifs_utils}/sbin/mount.cifs
'';
};
···
{
config = {
+
system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ];
boot.initrd.availableKernelModules = mkIf inInitrd
[ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
boot.initrd.extraUtilsCommands = mkIf inInitrd
''
+
copy_bin_and_libs ${pkgs.cifs-utils}/sbin/mount.cifs
'';
};
+1 -1
nixos/modules/virtualisation/brightbox-image.nix
···
postVM =
''
-
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
pushd $out
${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
rm $diskImageBase
···
postVM =
''
+
PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
rm $diskImageBase
+1 -1
nixos/modules/virtualisation/google-compute-image.nix
···
postVM =
''
-
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
pushd $out
mv $diskImageBase disk.raw
tar -Szcf $diskImageBase.tar.gz disk.raw
···
postVM =
''
+
PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
mv $diskImageBase disk.raw
tar -Szcf $diskImageBase.tar.gz disk.raw
+2 -2
nixos/tests/virtualbox.nix
···
with pkgs.lib;
let
-
testVMConfig = vmName: attrs: { config, pkgs, ... }: let
guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;
miniInit = ''
#!${pkgs.stdenv.shell} -xe
-
export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
mkdir -p /var/run/dbus
cat > /etc/passwd <<EOF
···
with pkgs.lib;
let
+
testVMConfig = vmName: attrs: { config, pkgs, lib, ... }: let
guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;
miniInit = ''
#!${pkgs.stdenv.shell} -xe
+
export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
mkdir -p /var/run/dbus
cat > /etc/passwd <<EOF
+1 -1
pkgs/applications/audio/caudec/default.nix
···
postFixup = ''
for executable in $(cd $out/bin && ls); do
wrapProgram $out/bin/$executable \
-
--prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"
done
'';
···
postFixup = ''
for executable in $(cd $out/bin && ls); do
wrapProgram $out/bin/$executable \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ bc findutils sox procps opusTools lame flac ]}"
done
'';
+2 -2
pkgs/applications/audio/freewheeling/default.nix
···
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
-
, libsndfile, libogg
}:
stdenv.mkDerivation {
···
buildInputs = [
pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
-
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
];
patches = [ ./am_path_sdl.patch ./xml.patch ];
···
{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
+
, libSM, libsndfile, libogg
}:
stdenv.mkDerivation {
···
buildInputs = [
pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
+
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
];
patches = [ ./am_path_sdl.patch ./xml.patch ];
+2 -2
pkgs/applications/audio/mopidy/default.nix
···
pythonPackages.buildPythonApplication rec {
name = "mopidy-${version}";
-
version = "2.0.0";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "v${version}";
-
sha256 = "06f1y87dqc7p6kq5npmg3ki8x4iacyjzd7nq7188x20y2zglrjbm";
};
nativeBuildInputs = [ wrapGAppsHook ];
···
pythonPackages.buildPythonApplication rec {
name = "mopidy-${version}";
+
version = "2.0.1";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "v${version}";
+
sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp";
};
nativeBuildInputs = [ wrapGAppsHook ];
+1 -1
pkgs/applications/backup/areca/default.nix
···
substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar"
sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh
-
sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=${swt}/lib:$out/lib:${acl}/lib#g" bin/areca_run.sh
# https://sourceforge.net/p/areca/bugs/563/
substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \
···
substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar"
sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh
+
sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh
# https://sourceforge.net/p/areca/bugs/563/
substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \
+2 -2
pkgs/applications/editors/eclipse/build-eclipse.nix
···
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
-
[ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
# Create wrapper script. Pass -configuration to store
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
···
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
-
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk.out}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.
···
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
+
[ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo
# Create wrapper script. Pass -configuration to store
# settings in ~/.eclipse/org.eclipse.platform_<version> rather
···
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
+
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item.
+2 -2
pkgs/applications/editors/emacs-25/default.nix
···
in
stdenv.mkDerivation rec {
-
name = "emacs-25.1-rc1";
builder = ./builder.sh;
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
-
sha256 = "0cv1hars9zxlv040h7f3zz50fhn67dqa18ms4hg9sdblckk50360";
};
patches = lib.optionals stdenv.isDarwin [
···
in
stdenv.mkDerivation rec {
+
name = "emacs-25.1-rc2";
builder = ./builder.sh;
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
+
sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v";
};
patches = lib.optionals stdenv.isDarwin [
+1 -1
pkgs/applications/editors/idea/common.nix
···
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
-
--prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
···
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
+
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
+1 -1
pkgs/applications/editors/music/tuxguitar/default.nix
···
wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \
-
--prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';
···
wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \
+
--prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt alsaLib ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';
+1 -1
pkgs/applications/editors/netbeans/default.nix
···
mkdir -p $out/bin
cp -a netbeans $out
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
-
--prefix PATH : ${jdk}/bin:${which}/bin \
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"
···
mkdir -p $out/bin
cp -a netbeans $out
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \
--prefix JAVA_HOME : ${jdk.home} \
--add-flags "--jdkhome ${jdk.home}"
+1 -1
pkgs/applications/graphics/geeqie/default.nix
···
# Allow geeqie to find exiv2 and exiftran, necessary to
# losslessly rotate JPEG images.
sed -i $out/lib/geeqie/geeqie-rotate \
-
-e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'
'';
meta = with stdenv.lib; {
···
# Allow geeqie to find exiv2 and exiftran, necessary to
# losslessly rotate JPEG images.
sed -i $out/lib/geeqie/geeqie-rotate \
+
-e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH'
'';
meta = with stdenv.lib; {
+2 -2
pkgs/applications/graphics/processing/default.nix
···
mkdir -p $out/bin
cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \
-
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
-
--prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
ln -s ${jdk} $out/${name}/java
'';
···
mkdir -p $out/bin
cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
ln -s ${jdk} $out/${name}/java
'';
+1 -1
pkgs/applications/graphics/qtpfsgui/default.nix
···
'';
qmakeFlags = [
-
"EXIV2PATH=${exiv2}/include/exiv2"
"OPENEXRDIR=${openexr}/include/OpenEXR"
"FFTW3DIR=${fftwSinglePrec.dev}/include"
"LIBTIFFDIR=${libtiff.dev}/include"
···
'';
qmakeFlags = [
+
"EXIV2PATH=${exiv2.dev}/include/exiv2"
"OPENEXRDIR=${openexr}/include/OpenEXR"
"FFTW3DIR=${fftwSinglePrec.dev}/include"
"LIBTIFFDIR=${libtiff.dev}/include"
+1 -1
pkgs/applications/graphics/sane/backends/brscan4/default.nix
···
patchPhase = ''
${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
-
RPATH=${libusb}/lib
for a in usr/lib64/sane/*.so*; do
if ! test -L $a; then
patchelf --set-rpath $RPATH $a
···
patchPhase = ''
${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
+
RPATH=${libusb.out}/lib
for a in usr/lib64/sane/*.so*; do
if ! test -L $a; then
patchelf --set-rpath $RPATH $a
+1 -1
pkgs/applications/graphics/sane/backends/generic.nix
···
--replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
substituteInPlace $out/lib/libsane.la \
-
--replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"
'' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with stdenv.lib; {
···
--replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
substituteInPlace $out/lib/libsane.la \
+
--replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg"
'' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with stdenv.lib; {
+1 -1
pkgs/applications/misc/audio/wavesurfer/default.nix
···
ln -s $out/{nix-support,bin}/wavesurfer.tcl
wrapProgram "$out/nix-support/wavesurfer.tcl" \
--set TCLLIBPATH "${snack}/lib" \
-
--prefix PATH : "${tcl}/bin:${tk}/bin"
'';
meta = {
···
ln -s $out/{nix-support,bin}/wavesurfer.tcl
wrapProgram "$out/nix-support/wavesurfer.tcl" \
--set TCLLIBPATH "${snack}/lib" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}"
'';
meta = {
+1 -1
pkgs/applications/misc/avrdudess/default.nix
···
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
-
export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH"
# avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
···
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
+
export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
+8 -5
pkgs/applications/misc/blender/default.nix
···
-
{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
-
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
-
, zlib, fftw, opensubdiv
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada
···
};
buildInputs =
-
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
-
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
(opensubdiv.override { inherit cudaSupport; })
]
++ optional jackaudioSupport libjack2
···
"-DWITH_SDL=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_OPENCOLORIO=ON"
"-DWITH_PLAYER=ON"
"-DWITH_OPENSUBDIV=ON"
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
"-DPYTHON_VERSION=${python.majorVersion}"
]
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
···
+
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
+
, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
+
, zlib, fftw, opensubdiv, freetype
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit
, colladaSupport ? true, opencollada
···
};
buildInputs =
+
[ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
+
opencolorio openexr openimageio openjpeg python zlib fftw
(opensubdiv.override { inherit cudaSupport; })
]
++ optional jackaudioSupport libjack2
···
"-DWITH_SDL=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_OPENCOLORIO=ON"
+
"-DWITH_SYSTEM_OPENJPEG=ON"
"-DWITH_PLAYER=ON"
"-DWITH_OPENSUBDIV=ON"
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
"-DPYTHON_VERSION=${python.majorVersion}"
+
"-DWITH_PYTHON_INSTALL=OFF"
+
"-DWITH_PYTHON_INSTALL_NUMPY=OFF"
]
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
+1 -1
pkgs/applications/misc/ding/default.nix
···
cp ding.png $out/share/pixmaps/
cp ding.desktop $out/share/applications/
-
wrapProgram $out/bin/ding --prefix PATH : ${gnugrep}/bin:${aspellEnv}/bin:${tk}/bin:${fortune}/bin --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
'';
meta = with stdenv.lib; {
···
cp ding.png $out/share/pixmaps/
cp ding.desktop $out/share/applications/
+
wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
'';
meta = with stdenv.lib; {
+2 -2
pkgs/applications/misc/emem/default.nix
···
stdenv.mkDerivation rec {
pname = "emem";
-
version = "0.2.26";
name = "${pname}-${version}";
inherit jdk;
src = fetchurl {
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-
sha256 = "1qa3q2zgy20yq060b8gz5h7f5h8kbbk7rgfxvjbxllgd847qs4dy";
};
buildInputs = [ ];
···
stdenv.mkDerivation rec {
pname = "emem";
+
version = "0.2.27";
name = "${pname}-${version}";
inherit jdk;
src = fetchurl {
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
+
sha256 = "0zmh152dfgsq2yj14wb3504pyibq4r671q5yz6yy28ihym7qr0fd";
};
buildInputs = [ ];
+1 -1
pkgs/applications/misc/finalterm/default.nix
···
wrapProgram "$out/bin/finalterm" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
-
--prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with lib; {
···
wrapProgram "$out/bin/finalterm" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
+
--prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with lib; {
+1 -1
pkgs/applications/misc/get_iplayer/default.nix
···
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp get_iplayer $out/bin
-
wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
'';
···
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp get_iplayer $out/bin
+
wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ ffmpeg flvstreamer vlc rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
cp get_iplayer.1 $out/share/man/man1
'';
+1 -1
pkgs/applications/misc/llpp/default.nix
···
dontStrip = true;
configurePhase = ''
-
sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype}/include+' build.sh
sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
'';
···
dontStrip = true;
configurePhase = ''
+
sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I ${freetype.dev}/include+' build.sh
sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
'';
+1 -1
pkgs/applications/misc/pgadmin/default.nix
···
configureFlags = [
"--with-libxml2=${libxml2}"
-
"--with-libxslt=${libxslt}"
];
meta = with stdenv.lib; {
···
configureFlags = [
"--with-libxml2=${libxml2}"
+
"--with-libxslt=${libxslt.dev}"
];
meta = with stdenv.lib; {
+2 -2
pkgs/applications/misc/translate-shell/default.nix
···
substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""
substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"
-
substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses}/bin/tput\""
substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "
substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""
substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""
-
substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl}/bin/curl\""
substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "
···
substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""
substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"
+
substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\""
substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""
substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "
substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""
substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""
+
substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\""
substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "
+1 -1
pkgs/applications/misc/webthree-umbrella/default.nix
···
]);
configurePhase = ''
-
export BOOST_INCLUDEDIR=${boost}/include
export BOOST_LIBRARYDIR=${boost.out}/lib
mkdir -p Build/Install
···
]);
configurePhase = ''
+
export BOOST_INCLUDEDIR=${boost.dev}/include
export BOOST_LIBRARYDIR=${boost.out}/lib
mkdir -p Build/Install
+1
pkgs/applications/networking/browsers/chromium/common.nix
···
patches = [
./patches/widevine.patch
(if versionOlder version "52.0.0.0"
then ./patches/nix_plugin_paths_50.patch
else ./patches/nix_plugin_paths_52.patch)
···
patches = [
./patches/widevine.patch
+
./patches/glibc-2.24.patch
(if versionOlder version "52.0.0.0"
then ./patches/nix_plugin_paths_50.patch
else ./patches/nix_plugin_paths_52.patch)
+14
pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
···
···
+
--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200
+
+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200
+
@@ -41,6 +41,11 @@
+
#include <errno.h>
+
#include <sys/mman.h>
+
+
+#if OS(LINUX) && defined(MADV_FREE)
+
+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
+
+#undef MADV_FREE
+
+#endif
+
+
+
#ifndef MADV_FREE
+
#define MADV_FREE MADV_DONTNEED
+
#endif
+2
pkgs/applications/networking/browsers/firefox/wrapper.nix
···
, trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
, esteidfirefoxplugin
}:
## configurability of the wrapper itself
···
++ lib.optional (cfg.enableBluejeans or false) bluejeans
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
++ lib.optionals (cfg.enableQuakeLive or false)
···
, trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
, esteidfirefoxplugin
+
, vlc_npapi
}:
## configurability of the wrapper itself
···
++ lib.optional (cfg.enableBluejeans or false) bluejeans
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
+
++ lib.optional (cfg.enableVLC or false) vlc_npapi
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
++ lib.optionals (cfg.enableQuakeLive or false)
+8 -3
pkgs/applications/networking/browsers/qutebrowser/default.nix
···
'';
postInstall = ''
-
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
-
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
-
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
···
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
'';
meta = {
···
'';
postInstall = ''
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
install -Dm644 qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
···
install -Dm644 icons/qutebrowser.svg \
"$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
+
'';
+
+
postFixup = ''
+
wrapPythonPrograms
+
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
+
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
+
+
sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
'';
meta = {
+1 -1
pkgs/applications/networking/cluster/hadoop/default.nix
···
mv * $out
for n in $out/{bin,sbin}"/"*; do
-
wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
done
'';
···
mv * $out
for n in $out/{bin,sbin}"/"*; do
+
wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
done
'';
+2 -2
pkgs/applications/networking/cluster/kubernetes/default.nix
···
preFixup = ''
wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
-
wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin:${procps-ng}/bin"
chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
-
wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${e2fsprogs}/bin:${utillinux}/bin"
substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \
--replace KUBE_OUTPUT_HOSTBIN KUBE_BIN
'';
···
preFixup = ''
wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
+
wrapProgram "$out/bin/kubelet" --prefix PATH : "${stdenv.lib.makeBinPath [ utillinux procps-ng ]}"
chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
+
wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${stdenv.lib.makeBinPath [ e2fsprogs utillinux ]}"
substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \
--replace KUBE_OUTPUT_HOSTBIN KUBE_BIN
'';
+1 -1
pkgs/applications/networking/cluster/pig/default.nix
···
for n in $out/{bin,sbin}"/"*; do
wrapProgram $n \
-
--prefix PATH : "${jre}/bin:${bash}/bin" \
--set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}"
done
'';
···
for n in $out/{bin,sbin}"/"*; do
wrapProgram $n \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \
--set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}"
done
'';
+8 -2
pkgs/applications/networking/cluster/terraform/default.nix
···
buildGoPackage rec {
name = "terraform-${version}";
-
version = "0.7.0";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform";
···
inherit rev;
owner = "hashicorp";
repo = "terraform";
-
sha256 = "0k5d6zph6sq1qg8vi5jmk7apy6v67xn5i7rqjamyr5an7lpxssc9";
};
postInstall = ''
···
fi
done
'';
}
···
buildGoPackage rec {
name = "terraform-${version}";
+
version = "0.7.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/terraform";
···
inherit rev;
owner = "hashicorp";
repo = "terraform";
+
sha256 = "1nvz4nqkn8pl25zyw7x5079dbzmwdxsar9gbcjk1srfpa746j1y4";
};
postInstall = ''
···
fi
done
'';
+
+
meta = with stdenv.lib; {
+
description = "Tool for building, changing, and versioning infrastructure";
+
homepage = "https://www.terraform.io/";
+
license = licenses.mpl20;
+
};
}
+1 -1
pkgs/applications/networking/davmail/default.nix
···
installPhase = ''
mkdir -p $out/bin
cp ./* $out/bin/ -R
-
wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
'';
}
···
installPhase = ''
mkdir -p $out/bin
cp ./* $out/bin/ -R
+
wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}
'';
}
+1 -1
pkgs/applications/networking/esniper/default.nix
···
postInstall = ''
sed <"frontends/snipe" >"$out/bin/snipe" \
-
-e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\""
chmod 555 "$out/bin/snipe"
'';
···
postInstall = ''
sed <"frontends/snipe" >"$out/bin/snipe" \
+
-e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\""
chmod 555 "$out/bin/snipe"
'';
+1 -1
pkgs/applications/networking/ike/default.nix
···
installPhase = ''
make install
for file in "$out"/bin/* "$out"/sbin/*; do
-
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
done
'';
···
installPhase = ''
make install
for file in "$out"/bin/* "$out"/sbin/*; do
+
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.glibc libedit qt4 ]}"
done
'';
+2 -2
pkgs/applications/networking/instant-messengers/hipchat/default.nix
···
let
-
version = "4.0.1641";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
···
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
-
sha256 = "15xy89qmldp1zs3f809b8sayvawc7sz24l0718iib83g5jzvivsm";
}
else
throw "HipChat is not supported on ${stdenv.system}";
···
let
+
version = "4.26.0.1655";
rpath = stdenv.lib.makeLibraryPath [
xdg_utils
···
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
+
sha256 = "1y484cp77kz984z9zdsy6c4669fmwv2knc287c1v24s81p5pqygg";
}
else
throw "HipChat is not supported on ${stdenv.system}";
+1 -1
pkgs/applications/networking/instant-messengers/jitsi/default.nix
···
chmod +x $out/bin/jitsi
substituteInPlace $out/bin/jitsi \
--subst-var-by JAVA ${jdk}/bin/java \
-
--subst-var-by EXTRALIBS ${gtk2}/lib
patchShebangs $out
libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
···
chmod +x $out/bin/jitsi
substituteInPlace $out/bin/jitsi \
--subst-var-by JAVA ${jdk}/bin/java \
+
--subst-var-by EXTRALIBS ${gtk2.out}/lib
patchShebangs $out
libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+1 -1
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
···
'';
passthru = {
-
wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin";
};
meta = with stdenv.lib; {
···
'';
passthru = {
+
wrapArgs = "--prefix PATH ':' ${stdenv.lib.makeBinPath [ texLive imagemagick ]}";
};
meta = with stdenv.lib; {
+1 -1
pkgs/applications/networking/instant-messengers/sflphone/default.nix
···
# gtk3 programs have the runtime dependency on XDG_DATA_DIRS
preFixup = ''
for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
-
wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
···
# gtk3 programs have the runtime dependency on XDG_DATA_DIRS
preFixup = ''
for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
+
wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
+1 -1
pkgs/applications/networking/instant-messengers/viber/default.nix
···
wrapProgram $out/opt/viber/Viber \
--set QT_PLUGIN_PATH "$out/opt/viber/plugins" \
--set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
-
--set QTCOMPOSE "${xorg.libX11}/share/X11/locale"
ln -s $out/opt/viber/Viber $out/bin/viber
mv $out/usr/share $out/share
···
wrapProgram $out/opt/viber/Viber \
--set QT_PLUGIN_PATH "$out/opt/viber/plugins" \
--set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
+
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
ln -s $out/opt/viber/Viber $out/bin/viber
mv $out/usr/share $out/share
+1 -1
pkgs/applications/networking/mailreaders/mailpile/default.nix
···
postInstall = ''
wrapProgram $out/bin/mailpile \
-
--prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
'';
meta = with stdenv.lib; {
···
postInstall = ''
wrapProgram $out/bin/mailpile \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/applications/networking/newsreaders/liferea/default.nix
···
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
···
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
+14 -12
pkgs/applications/networking/p2p/freenet/default.nix
···
-
{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:
let
freenet_ext = fetchurl {
···
sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
};
bcprov = fetchurl {
-
url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar;
-
sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d";
};
seednodes = fetchurl {
url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref;
-
sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
};
-
version = "build01470";
freenet-jars = stdenv.mkDerivation {
name = "freenet-jars-${version}";
-
src = fetchgit {
-
url = https://github.com/freenet/fred;
-
rev = "refs/tags/${version}";
-
sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
};
patchPhase = ''
cp ${freenet_ext} lib/freenet/freenet-ext.jar
-
cp ${bcprov} lib/bcprov-jdk15on-152.jar
sed '/antcall.*-ext/d' -i build.xml
sed 's/@unknown@/${version}/g' -i build-clean.xml
···
installPhase = ''
mkdir -p $out/share/freenet
-
cp lib/bcprov-jdk15on-152.jar $out/share/freenet
cp lib/freenet/freenet-ext.jar $out/share/freenet
cp dist/freenet.jar $out/share/freenet
'';
···
src = substituteAll {
src = ./freenetWrapper;
-
inherit bash coreutils seednodes;
freenet = freenet-jars;
jre = jdk.jre;
};
···
+
{ stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }:
let
freenet_ext = fetchurl {
···
sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
};
+
bcprov_version = "jdk15on-154";
bcprov = fetchurl {
+
url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar";
+
sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk";
};
seednodes = fetchurl {
url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref;
+
sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
};
+
version = "build01475";
freenet-jars = stdenv.mkDerivation {
name = "freenet-jars-${version}";
+
src = fetchFromGitHub {
+
owner = "freenet";
+
repo = "fred";
+
rev = version;
+
sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08";
};
patchPhase = ''
cp ${freenet_ext} lib/freenet/freenet-ext.jar
+
cp ${bcprov} lib/bcprov-${bcprov_version}.jar
sed '/antcall.*-ext/d' -i build.xml
sed 's/@unknown@/${version}/g' -i build-clean.xml
···
installPhase = ''
mkdir -p $out/share/freenet
+
cp lib/bcprov-${bcprov_version}.jar $out/share/freenet
cp lib/freenet/freenet-ext.jar $out/share/freenet
cp dist/freenet.jar $out/share/freenet
'';
···
src = substituteAll {
src = ./freenetWrapper;
+
inherit bash coreutils seednodes bcprov_version;
freenet = freenet-jars;
jre = jdk.jre;
};
+1 -1
pkgs/applications/networking/p2p/freenet/freenetWrapper
···
chmod u+rw $FREENET_HOME/seednodes.fref
cd $FREENET_HOME
-
@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
···
chmod u+rw $FREENET_HOME/seednodes.fref
cd $FREENET_HOME
+
@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
+1 -1
pkgs/applications/networking/remote/citrix-receiver/default.nix
···
makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
--set ICAROOT "$ICAInstDir" \
-
--set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \
···
makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
--set ICAROOT "$ICAInstDir" \
+
--set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \
+1 -1
pkgs/applications/networking/seafile-client/default.nix
···
make install
wrapProgram $out/bin/seafile-applet \
-
--suffix PATH : ${ccnet}/bin:${seafile-shared}/bin
'';
meta =
···
make install
wrapProgram $out/bin/seafile-applet \
+
--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
'';
meta =
+1 -1
pkgs/applications/office/calligra/default.nix
···
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
-
--prefix PATH ':' "${pstoedit}/bin" \
--prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
done
'';
···
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
+
--prefix PATH ':' "${pstoedit.out}/bin" \
--prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
done
'';
+1 -1
pkgs/applications/office/gnucash/2.6.nix
···
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
-
--prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
done
rm $out/share/icons/hicolor/icon-theme.cache
···
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
+
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache
+2 -2
pkgs/applications/office/gnucash/default.nix
···
--prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
--prefix PERL5LIB ":" "$PERL5LIB" \
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
-
--prefix PATH ":" "$out/bin:${perl}/bin:${gconf}/bin"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.
-
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084
···
--prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
--prefix PERL5LIB ":" "$PERL5LIB" \
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
+
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.
+
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084
+2 -2
pkgs/applications/office/libreoffice/default.nix
···
-
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
···
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
-
python3 sablotron sane-backends tcsh unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
···
+
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
···
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
+
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
+2 -2
pkgs/applications/office/libreoffice/still.nix
···
-
{ stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
···
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
-
python3 sablotron sane-backends tcsh unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
···
+
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
···
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
+
python3 sablotron sane-backends unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
+1 -1
pkgs/applications/science/logic/satallax/default.nix
···
mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"
cp bin/satallax.opt "$out/bin/satallax"
wrapProgram "$out/bin/satallax" \
-
--suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \
--add-flags "-M" --add-flags "$out/lib/satallax/modes"
cp LICENSE README "$out/share/doc/satallax"
···
mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"
cp bin/satallax.opt "$out/bin/satallax"
wrapProgram "$out/bin/satallax" \
+
--suffix PATH : "${stdenv.lib.makeBinPath [ coq eprover ]}:$out/libexec/satallax" \
--add-flags "-M" --add-flags "$out/lib/satallax/modes"
cp LICENSE README "$out/share/doc/satallax"
+2 -2
pkgs/applications/version-management/gource/default.nix
···
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
-
, SDL_image, glew, mesa, boost, glm
}:
stdenv.mkDerivation rec {
···
buildInputs = [
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
-
boost glm
];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
···
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
+
, SDL_image, freetype, glew, mesa, boost, glm
}:
stdenv.mkDerivation rec {
···
buildInputs = [
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
+
boost glm freetype
];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+1 -1
pkgs/applications/video/mkcast/default.nix
···
postInstall = ''
for f in $out/bin/*; do #*/
-
wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"
done
rm -r screenkey/.bzr
···
postInstall = ''
for f in $out/bin/*; do #*/
+
wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin"
done
rm -r screenkey/.bzr
+1 -1
pkgs/applications/video/shotcut/default.nix
···
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
-
wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${jack1}/lib:${SDL.out}/lib
'';
meta = with stdenv.lib; {
···
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
+
wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]}
'';
meta = with stdenv.lib; {
+33
pkgs/applications/video/vlc/plugin.nix
···
···
+
{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk,
+
libxcb, xlibsWrapper, gtk}:
+
+
with stdenv.lib;
+
+
stdenv.mkDerivation rec {
+
name = "vlc-plugin-${version}";
+
version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4
+
+
src = fetchgit {
+
url = "https://code.videolan.org/videolan/npapi-vlc.git";
+
rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";
+
sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd";
+
};
+
+
preConfigure = "sh autogen.sh";
+
+
buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb
+
xlibsWrapper gtk ];
+
+
enableParallelBuilding = true;
+
+
passthru = {
+
mozillaPlugin = "/lib/mozilla/plugins";
+
};
+
+
meta = with stdenv.lib; {
+
description = "Webplugins based on libVLC (for firefox, npapi)";
+
homepage = https://code.videolan.org/videolan/npapi-vlc;
+
platforms = platforms.linux;
+
license = licenses.gpl2Plus;
+
};
+
}
+1 -1
pkgs/applications/virtualization/docker/default.nix
···
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
makeWrapper $out/libexec/docker/docker $out/bin/docker \
-
--prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin"
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
···
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
makeWrapper $out/libexec/docker/docker $out/bin/docker \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}"
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
+1 -1
pkgs/applications/virtualization/docker/gc.nix
···
cp docker-gc $out/bin
chmod +x $out/bin/docker-gc
wrapProgram $out/bin/docker-gc \
-
--prefix PATH : "${docker}/bin:${coreutils}/bin:${procps}/bin:${gnused}/bin:${findutils}/bin:${gnugrep}/bin"
'';
meta = {
···
cp docker-gc $out/bin
chmod +x $out/bin/docker-gc
wrapProgram $out/bin/docker-gc \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}"
'';
meta = {
+1 -3
pkgs/applications/virtualization/open-vm-tools/default.nix
···
postInstall = ''
sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
-
--prefix PATH ':' "${iproute}/bin" \
-
--prefix PATH ':' "${dbus}/bin" \
-
--prefix PATH ':' "${systemd}/bin"
'';
meta = with stdenv.lib; {
···
postInstall = ''
sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network"
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
+
--prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
···
for i in lib/VBoxOGL*.so
do
-
patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
···
for i in lib/VBoxOGL*.so
do
+
patchelf --set-rpath ${lib.makeLibraryPath [ "$out" dbus libXcomposite libXdamage libXext libXfixes ]} $i
done
# FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
+3
pkgs/applications/virtualization/xen/generic.nix
···
touch tools/include/gnu/stubs-32.h
'';
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
···
touch tools/include/gnu/stubs-32.h
'';
+
# Fix build on Glibc 2.24.
+
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
+1 -1
pkgs/applications/window-managers/awesome/default.nix
···
--prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
-
--prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"
···
--prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}"
wrapProgram $out/bin/awesome-client \
--prefix PATH : "${which}/bin"
+3 -3
pkgs/applications/window-managers/compton/git.nix
···
libXrandr, libXrender, xwininfo }:
stdenv.mkDerivation {
-
name = "compton-git-2015-09-21";
src = fetchFromGitHub {
owner = "chjj";
repo = "compton";
-
rev = "2343e4bbd298b35ea5c190c52abd2b0cb9f79a18";
-
sha256 = "1pb0ic47sfd796crwk47cya2ahbxsm6ygi6sh4fwd734kwz37h4z";
};
nativeBuildInputs = [
···
libXrandr, libXrender, xwininfo }:
stdenv.mkDerivation {
+
name = "compton-git-2016-08-10";
src = fetchFromGitHub {
owner = "chjj";
repo = "compton";
+
rev = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a";
+
sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p";
};
nativeBuildInputs = [
+1 -1
pkgs/applications/window-managers/stumpwm/default.nix
···
cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
chmod +x $out/bin/stumpish
wrapProgram $out/bin/stumpish \
-
--prefix PATH ":" "${rlwrap}/bin:${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:${xprop}/bin"
# Paths in the compressed image $out/bin/stumpwm are not
# recognized by Nix. Add explicit reference here.
···
cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
chmod +x $out/bin/stumpish
wrapProgram $out/bin/stumpish \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"
# Paths in the compressed image $out/bin/stumpwm are not
# recognized by Nix. Add explicit reference here.
+1 -1
pkgs/build-support/vm/default.nix
···
buildCommand = ''
${createRootFS}
-
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin
# Unpack the .debs. We do this to prevent pre-install scripts
# (which have lots of circular dependencies) from barfing.
···
buildCommand = ''
${createRootFS}
+
PATH=$PATH:${stdenv.lib.makeBinPath [ dpkg dpkg glibc lzma ]}
# Unpack the .debs. We do this to prevent pre-install scripts
# (which have lots of circular dependencies) from barfing.
+2 -2
pkgs/data/fonts/cantarell-fonts/default.nix
···
stdenv.mkDerivation rec {
major = "0.0";
-
minor = "24";
name = "cantarell-fonts-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz";
-
sha256 = "0r4jnc2x9yncf40lixjb1pqgpq8rzbi2fz33pshlqzjgx2d69bcw";
};
meta = {
···
stdenv.mkDerivation rec {
major = "0.0";
+
minor = "25";
name = "cantarell-fonts-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz";
+
sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl";
};
meta = {
+1 -1
pkgs/desktops/enlightenment/efl.nix
···
patches = [ ./efl-elua.patch ];
preConfigure = ''
-
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
'';
···
patches = [ ./efl-elua.patch ];
preConfigure = ''
+
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
'';
+1 -1
pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix
···
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" ];
-
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
enableParallelBuilding = true;
···
configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" ];
+
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
+1 -1
pkgs/desktops/gnome-3/3.20/apps/gedit/default.nix
···
enableParallelBuilding = true;
preFixup = ''
-
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib")
'';
meta = with stdenv.lib; {
···
enableParallelBuilding = true;
preFixup = ''
+
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}")
'';
meta = with stdenv.lib; {
+1 -1
pkgs/desktops/gnome-3/3.20/apps/gnome-boxes/default.nix
···
wrapProgram "$prog" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-
--prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin"
done
'';
···
wrapProgram "$prog" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"
done
'';
+3 -3
pkgs/desktops/gnome-3/3.20/core/empathy/default.nix
···
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
file libtool librsvg ];
-
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
-
"-I${dbus_libs}/include/dbus-1.0"
-
"-I${dbus_libs}/lib/dbus-1.0/include" ];
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
···
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
file libtool librsvg ];
+
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
+
"-I${dbus_libs.dev}/include/dbus-1.0"
+
"-I${dbus_libs.dev}/lib/dbus-1.0/include" ];
preFixup = ''
for f in $out/bin/* $out/libexec/*; do
+1 -1
pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
···
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ];
-
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
enableParallelBuilding = true;
···
gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ];
+
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
+2 -2
pkgs/desktops/gnome-3/3.20/core/folks/default.nix
···
configureFlags = "--disable-fatal-warnings";
-
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-
"-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
enableParallelBuilding = true;
···
configureFlags = "--disable-fatal-warnings";
+
NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss}/include/nss"
+
"-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
enableParallelBuilding = true;
+20
pkgs/desktops/gnome-3/3.20/core/gnome-calculator/default.nix
···
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
···
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
# Fix for https://github.com/NixOS/nixpkgs/issues/17912
+
# See also https://bugzilla.gnome.org/show_bug.cgi?id=673101
+
# Should be removed when next release comes out
+
srcHistoryEntry = fetchurl {
+
url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/9bb6936ba74602ec891c1ffecdf1665dba1a1be4/data/history-entry.ui";
+
sha256 = "0a6d6anwrg5l3kc7i8jyky4idnzi9bhjv9awi6615505pjhcxnaj";
+
};
+
+
srcHistoryView = fetchurl {
+
url = "https://raw.githubusercontent.com/GNOME/gnome-calculator/b87b4f5cd0cff0b9cf9e9cd2a056c56be653cab1/data/history-view.ui";
+
sha256 = "0zyq1mcxsh707jhh3vfqplk5s83lb26gvjz62l5l6rq5yrd43fyw";
+
};
+
+
prePatch = ''
+
[ -f data/history-entry.ui ] && echo Remove the fix && exit 1
+
[ -f data/history-view.ui ] && echo Remove the fix && exit 1
+
cp -v ${srcHistoryEntry} data/history-entry.ui
+
cp -v ${srcHistoryView} data/history-view.ui
+
'';
+
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+1 -1
pkgs/desktops/gnome-3/3.20/core/gnome-dictionary/default.nix
···
preFixup = ''
wrapProgram "$out/bin/gnome-dictionary" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
preFixup = ''
wrapProgram "$out/bin/gnome-dictionary" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
···
preFixup = ''
wrapProgram "$out/bin/gnome-keyring" \
-
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-keyring-daemon" \
-
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
preFixup = ''
wrapProgram "$out/bin/gnome-keyring" \
+
--prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-keyring-daemon" \
+
--prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
-
NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
enableParallelBuilding = true;
···
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
+
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
enableParallelBuilding = true;
+1 -1
pkgs/desktops/gnome-3/3.20/core/gnome-screenshot/default.nix
···
preFixup = ''
wrapProgram "$out/bin/gnome-screenshot" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
preFixup = ''
wrapProgram "$out/bin/gnome-screenshot" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+2 -1
pkgs/desktops/gnome-3/3.20/core/gnome-session/default.nix
···
gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
preFixup = ''
wrapProgram "$out/bin/gnome-session" \
-
--prefix PATH : "${glib}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
···
gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
# FIXME: glib binaries shouldn't be in .dev!
preFixup = ''
wrapProgram "$out/bin/gnome-session" \
+
--prefix PATH : "${glib.dev}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
+2 -1
pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix
···
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
preFixup = ''
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-
--prefix PATH : "${glib}/bin" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
···
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
+
# FIXME: glib binaries shouldn't be in .dev!
preFixup = ''
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+
--prefix PATH : "${glib.dev}/bin" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
+1 -1
pkgs/desktops/gnome-3/3.20/core/gnome-system-log/default.nix
···
preFixup = ''
wrapProgram "$out/bin/gnome-system-log" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
preFixup = ''
wrapProgram "$out/bin/gnome-system-log" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix
···
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
'';
-
configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-
"--with-modules-path=${apacheHttpd_2_2}/modules"
"--disable-bluetooth"
"--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
···
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
'';
+
configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
+
"--with-modules-path=${apacheHttpd_2_2.dev}/modules"
"--disable-bluetooth"
"--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+1 -1
pkgs/desktops/gnome-3/3.20/core/tracker/default.nix
···
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler";
enableParallelBuilding = true;
···
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler";
enableParallelBuilding = true;
+1 -1
pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix
···
wrapProgram "$out/bin/gitg" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
wrapProgram "$out/bin/gitg" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/desktops/gnome-3/extensions/system-monitor.nix
···
];
buildPhase = ''
-
${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''
···
];
buildPhase = ''
+
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''
+1 -1
pkgs/desktops/gnome-3/extensions/volume-mixer.nix
···
];
buildPhase = ''
-
${glib}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''
···
];
buildPhase = ''
+
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
'';
installPhase = ''
+13 -9
pkgs/desktops/kde-5/plasma/startkde/startkde.sh
···
fi
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
-
export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
fi
XCURSOR_PATH=~/.icons
IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
···
#
xsetroot -cursor_name left_ptr
dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
···
echo 'startkde: Starting up...' 1>&2
# Make sure that D-Bus is running
-
if $qdbus >/dev/null 2>/dev/null; then
: # ok
else
echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
···
export KDE_SESSION_VERSION
xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-
KDE_SESSION_UID=`id -ru`
export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
···
fi
qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
-
-
# (NixOS) Run kbuildsycoca5 before starting the user session because things
-
# may be missing or moved if they have run nixos-rebuild and it may not be
-
# possible for them to start Konsole to run it manually!
-
kbuildsycoca5
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
···
fi
[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+
if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
+
export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
fi
+
#Manually disable auto scaling because we are scaling above
+
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
+
export QT_AUTO_SCREEN_SCALE_FACTOR=0
XCURSOR_PATH=~/.icons
IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
···
#
xsetroot -cursor_name left_ptr
+
if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+
xrdb -quiet -merge -nocpp <<EOF
+
Xft.dpi: $kcmfonts_general_forcefontdpi
+
EOF
+
fi
+
dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
···
echo 'startkde: Starting up...' 1>&2
# Make sure that D-Bus is running
+
if qdbus >/dev/null 2>/dev/null; then
: # ok
else
echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
···
export KDE_SESSION_VERSION
xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
KDE_SESSION_UID=$(id -ru)
export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE
···
fi
qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
+1 -1
pkgs/development/compilers/factor-lang/default.nix
···
sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \
$out/lib/factor/extra/tzinfo/tzinfo.factor
-
sed -ie 's#/usr/share/terminfo#${ncurses}/share/terminfo#g' \
$out/lib/factor/extra/terminfo/terminfo.factor
cp ./factor $out/bin
···
sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \
$out/lib/factor/extra/tzinfo/tzinfo.factor
+
sed -ie 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \
$out/lib/factor/extra/terminfo/terminfo.factor
cp ./factor $out/bin
+1 -1
pkgs/development/compilers/gcc-arm-embedded/default.nix
···
for f in $(find $out); do
if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
-
--set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \
"$f" || true
fi
done
···
for f in $(find $out); do
if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
+
--set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \
"$f" || true
fi
done
+2 -2
pkgs/development/compilers/gcc/6/default.nix
···
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
-
--with-gmp=${gmp}
-
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
···
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+
--with-gmp=${gmp.dev}
+
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
+1 -1
pkgs/development/compilers/ghc/6.10.2-binary.nix
···
(if stdenv.isLinux then ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-
--set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \;
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done
···
(if stdenv.isLinux then ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+
--set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \;
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done
+1 -1
pkgs/development/compilers/ghc/7.0.4-binary.nix
···
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-
--set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
···
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+
--set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
+1 -1
pkgs/development/compilers/ghc/7.10.2.nix
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
-
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
done
'';
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
+
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';
+1 -1
pkgs/development/compilers/ghc/7.10.3.nix
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
-
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
done
'';
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
+
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';
+1 -1
pkgs/development/compilers/ghc/7.4.2-binary.nix
···
ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-
--set-rpath "$out/lib:${gmp.out}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
···
ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+
--set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
+1 -1
pkgs/development/compilers/ghc/8.0.1.nix
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
-
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
done
'';
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
+
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';
+1 -1
pkgs/development/compilers/ghc/head.nix
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
-
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
done
'';
···
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
+
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';
+1 -1
pkgs/development/compilers/julia/default.nix
···
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
-
--prefix PATH : "${curl}/bin"
done
'';
···
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
done
'';
+2 -2
pkgs/development/compilers/julia/git.nix
···
postInstall = ''
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
-
--prefix LD_LIBRARY_PATH : "$out/lib/julia:$LD_LIBRARY_PATH" \
-
--prefix PATH : "${curl}/bin"
done
'';
···
postInstall = ''
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
+
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
done
'';
+1 -1
pkgs/development/compilers/microscheme/default.nix
···
make install PREFIX=$out
wrapProgram $out/bin/microscheme \
-
--prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin"
'';
meta = with stdenv.lib; {
···
make install PREFIX=$out
wrapProgram $out/bin/microscheme \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/development/compilers/opa/default.nix
···
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.
-
codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin";
preConfigure = ''
patchShebangs .
···
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.
+
codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
preConfigure = ''
patchShebangs .
+1 -1
pkgs/development/compilers/opendylan/bin.nix
···
for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
-
sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin
'';
···
for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
+
sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam
wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin
'';
+1 -1
pkgs/development/compilers/ponyc/default.nix
···
checkTarget = "test";
preCheck = ''
-
export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib"
'';
installPhase = ''
···
checkTarget = "test";
preCheck = ''
+
export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}"
'';
installPhase = ''
+1 -1
pkgs/development/compilers/squeak/default.nix
···
postPatch = ''
for i in squeak.in squeak.sh.in; do
substituteInPlace unix/cmake/$i --replace "PATH=" \
-
"PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
done
'';
···
postPatch = ''
for i in squeak.in squeak.sh.in; do
substituteInPlace unix/cmake/$i --replace "PATH=" \
+
"PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
done
'';
+2 -2
pkgs/development/haskell-modules/hackage-packages.nix
···
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
-
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";
···
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
-
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";
···
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
+
PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";
···
doHaddock = false;
preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
preCompileBuildDriver = ''
+
PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
'';
homepage = "https://github.com/haskell-gi/haskell-gi";
+1 -1
pkgs/development/interpreters/elixir/default.nix
···
b=$(basename $f)
if [ $b == "mix" ]; then continue; fi
wrapProgram $f \
-
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done
···
b=$(basename $f)
if [ $b == "mix" ]; then continue; fi
wrapProgram $f \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done
+1 -1
pkgs/development/interpreters/erlang/R16.nix
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
setupHook = ./setup-hook.sh;
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/interpreters/erlang/R17.nix
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
setupHook = ./setup-hook.sh;
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/interpreters/erlang/R18.nix
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
setupHook = ./setup-hook.sh;
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/interpreters/erlang/R19.nix
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
'';
setupHook = ./setup-hook.sh;
···
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;
+1 -1
pkgs/development/interpreters/lfe/default.nix
···
# Add some stuff to PATH so the scripts can run without problems.
for f in $out/bin/*; do
wrapProgram $f \
-
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin"
substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
done
'';
···
# Add some stuff to PATH so the scripts can run without problems.
for f in $out/bin/*; do
wrapProgram $f \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin"
substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
done
'';
+1 -1
pkgs/development/interpreters/love/0.7.nix
···
'';
NIX_CFLAGS_COMPILE = ''
-
-I${SDL}/include/SDL
-I${freetype.dev}include/freetype2
'';
···
'';
NIX_CFLAGS_COMPILE = ''
+
-I${SDL.dev}/include/SDL
-I${freetype.dev}include/freetype2
'';
+13 -15
pkgs/development/libraries/SDL/default.nix
···
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
-
, openglSupport ? false, mesa ? null
-
, alsaSupport ? true, alsaLib ? null
-
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
-
, pulseaudioSupport ? true, libpulseaudio ? null
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
}:
···
# PulseAudio.
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
-
assert openglSupport -> (mesa != null && x11Support);
-
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
-
assert alsaSupport -> alsaLib != null;
-
assert pulseaudioSupport -> libpulseaudio != null;
-
let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
-
version = "1.2.15";
name = "SDL-${version}";
src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
···
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs =
-
optionals x11Support [ xlibsWrapper libXrandr ] ++
optional alsaSupport alsaLib ++
optional stdenv.isLinux libcap ++
-
optional openglSupport mesa ++
optional pulseaudioSupport libpulseaudio ++
optional stdenv.isDarwin Cocoa;
···
"--enable-rpath"
"--disable-pulseaudio-shared"
"--disable-osmesa-shared"
-
] ++ stdenv.lib.optionals (stdenv ? cross) ([
"--without-x"
-
] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib");
patches = [
# Fix window resizing issues, e.g. for xmonad
···
url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
})
];
postFixup = ''moveToOutput share/aclocal "$dev" '';
passthru = { inherit openglSupport; };
meta = with stdenv.lib; {
description = "A cross-platform multimedia library";
-
homepage = http://www.libsdl.org/;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
license = licenses.lgpl21;
···
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
+
, openglSupport ? false, mesa_noglu
+
, alsaSupport ? true, alsaLib
+
, x11Support ? true, libXext, libICE, libXrandr
+
, pulseaudioSupport ? true, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
}:
···
# PulseAudio.
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
name = "SDL-${version}";
+
version = "1.2.15";
src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
···
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs =
+
optionals x11Support [ libXext libICE libXrandr ] ++
optional alsaSupport alsaLib ++
optional stdenv.isLinux libcap ++
+
optional openglSupport mesa_noglu ++
optional pulseaudioSupport libpulseaudio ++
optional stdenv.isDarwin Cocoa;
···
"--enable-rpath"
"--disable-pulseaudio-shared"
"--disable-osmesa-shared"
+
] ++ optionals (stdenv ? cross) ([
"--without-x"
+
] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib");
patches = [
# Fix window resizing issues, e.g. for xmonad
···
url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
})
+
./find-headers.patch
];
postFixup = ''moveToOutput share/aclocal "$dev" '';
+
+
setupHook = ./setup-hook.sh;
passthru = { inherit openglSupport; };
meta = with stdenv.lib; {
description = "A cross-platform multimedia library";
+
homepage = "http://www.libsdl.org/";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
license = licenses.lgpl21;
+16
pkgs/development/libraries/SDL/find-headers.patch
···
···
+
diff -ru3 SDL-1.2.15/sdl-config.in SDL-1.2.15-new/sdl-config.in
+
--- SDL-1.2.15/sdl-config.in 2012-01-19 10:30:06.000000000 +0400
+
+++ SDL-1.2.15-new/sdl-config.in 2016-08-22 05:32:52.716397920 +0300
+
@@ -42,7 +42,11 @@
+
echo @SDL_VERSION@
+
;;
+
--cflags)
+
- echo -I@includedir@/SDL @SDL_CFLAGS@
+
+ SDL_CFLAGS=""
+
+ for i in @includedir@/SDL $SDL_PATH; do
+
+ SDL_CFLAGS="$SDL_CFLAGS -I$i"
+
+ done
+
+ echo $SDL_CFLAGS @SDL_CFLAGS@
+
;;
+
@ENABLE_SHARED_TRUE@ --libs)
+
@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+11
pkgs/development/libraries/SDL/setup-hook.sh
···
···
+
addSDLPath () {
+
if [ -e "$1/include/SDL" ]; then
+
export SDL_PATH="$SDL_PATH $1/include/SDL"
+
fi
+
}
+
+
if test -n "$crossConfig"; then
+
crossEnvHooks+=(addSDLPath)
+
else
+
envHooks+=(addSDLPath)
+
fi
+39 -30
pkgs/development/libraries/SDL2/default.nix
···
-
{ stdenv, fetchurl, pkgconfig, audiofile
-
, openglSupport ? false, mesa ? null
-
, alsaSupport ? true, alsaLib ? null
-
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
-
, pulseaudioSupport ? true, libpulseaudio ? null
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
}:
···
# PulseAudio.
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
-
assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
-
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
-
assert alsaSupport -> alsaLib != null;
-
assert pulseaudioSupport -> libpulseaudio != null;
let
-
configureFlagsFun = attrs: ''
-
--disable-oss --disable-x11-shared
-
--disable-pulseaudio-shared --disable-alsa-shared
-
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""}
-
${if (!x11Support) then "--without-x" else ""}
-
'';
in
stdenv.mkDerivation rec {
-
name = "SDL2-2.0.3";
src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
-
sha256 = "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5";
};
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-
propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++
-
stdenv.lib.optional pulseaudioSupport libpulseaudio;
-
buildInputs = [ pkgconfig audiofile ] ++
-
stdenv.lib.optional openglSupport mesa ++
-
stdenv.lib.optional alsaSupport alsaLib ++
-
stdenv.lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
dontDisableStatic = true;
···
configureFlags = configureFlagsFun { inherit alsaLib; };
crossAttrs = {
-
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
};
postInstall = ''
rm $out/lib/*.a
'';
-
passthru = {inherit openglSupport;};
-
meta = {
description = "A cross-platform multimedia library";
-
homepage = http://www.libsdl.org/;
-
license = stdenv.lib.licenses.zlib;
-
platforms = stdenv.lib.platforms.all;
-
maintainers = [ stdenv.lib.maintainers.page ];
};
}
···
+
{ stdenv, lib, fetchurl, pkgconfig, audiofile
+
, openglSupport ? false, mesa_noglu
+
, alsaSupport ? true, alsaLib
+
, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
+
, dbusSupport ? false, dbus
+
, udevSupport ? false, udev
+
, ibusSupport ? false, ibus
+
, pulseaudioSupport ? true, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
}:
···
# PulseAudio.
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
+
assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support);
let
+
configureFlagsFun = attrs: [
+
"--disable-oss" "--disable-x11-shared"
+
"--disable-pulseaudio-shared" "--disable-alsa-shared"
+
] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"
+
++ lib.optional (!x11Support) "--without-x";
in
stdenv.mkDerivation rec {
+
name = "SDL2-${version}";
+
version = "2.0.4";
src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
+
sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs";
};
+
patches = [ ./find-headers.patch ];
+
+
nativeBuildInputs = [ pkgconfig ];
+
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
+
propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
+
lib.optional pulseaudioSupport libpulseaudio;
+
buildInputs = [ audiofile ] ++
+
lib.optional openglSupport mesa_noglu ++
+
lib.optional alsaSupport alsaLib ++
+
lib.optional dbusSupport dbus ++
+
lib.optional udevSupport udev ++
+
lib.optional ibusSupport ibus ++
+
lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
dontDisableStatic = true;
···
configureFlags = configureFlagsFun { inherit alsaLib; };
crossAttrs = {
+
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
};
postInstall = ''
rm $out/lib/*.a
'';
+
setupHook = ./setup-hook.sh;
+
+
passthru = { inherit openglSupport; };
+
meta = with stdenv.lib; {
description = "A cross-platform multimedia library";
+
homepage = "http://www.libsdl.org/";
+
license = licenses.zlib;
+
platforms = platforms.all;
+
maintainers = with maintainers; [ page ];
};
}
+26
pkgs/development/libraries/SDL2/find-headers.patch
···
···
+
diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in
+
--- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300
+
+++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300
+
@@ -6,5 +6,5 @@
+
set(SDL2_PREFIX "@prefix@")
+
set(SDL2_EXEC_PREFIX "@prefix@")
+
set(SDL2_LIBDIR "@libdir@")
+
-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH})
+
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
+
diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in
+
--- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300
+
+++ SDL2-2.0.4-new/sdl2-config.in 2016-08-22 05:32:02.256397839 +0300
+
@@ -42,7 +42,11 @@
+
echo @SDL_VERSION@
+
;;
+
--cflags)
+
- echo -I@includedir@/SDL2 @SDL_CFLAGS@
+
+ SDL_CFLAGS=""
+
+ for i in @includedir@/SDL2 $SDL2_PATH; do
+
+ SDL_CFLAGS="$SDL_CFLAGS -I$i"
+
+ done
+
+ echo $SDL_CFLAGS @SDL_CFLAGS@
+
;;
+
@ENABLE_SHARED_TRUE@ --libs)
+
@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+11
pkgs/development/libraries/SDL2/setup-hook.sh
···
···
+
addSDL2Path () {
+
if [ -e "$1/include/SDL2" ]; then
+
export SDL2_PATH="$SDL2_PATH $1/include/SDL2"
+
fi
+
}
+
+
if test -n "$crossConfig"; then
+
crossEnvHooks+=(addSDL2Path)
+
else
+
envHooks+=(addSDL2Path)
+
fi
+13 -24
pkgs/development/libraries/SDL2_gfx/default.nix
···
-
{stdenv, fetchsvn, SDL2}:
-
let rev = 5; in
stdenv.mkDerivation rec {
-
name = "SDL2_gfx-${toString rev}";
-
src = fetchsvn {
-
url = http://svn.code.sf.net/p/sdl2gfx/code/trunk;
-
inherit rev;
-
sha256 = "1hzilbn1412m2b44mygrbdfh1gvks4v5p0kmafz248jf9ifsvmzp";
};
-
buildInputs = [ SDL2 ] ;
-
configureFlags = "--disable-mmx";
-
postInstall = ''
-
sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
-
$out/include/SDL2/*.h
-
-
ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h;
-
ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h;
-
ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h;
-
ln -s $out/include/SDL2/*.h $out/include/;
-
'';
-
-
meta = {
description = "SDL graphics drawing primitives and support functions";
longDescription = ''
···
code. Its is written in plain C and can be used in C++ code.
'';
-
homepage = https://sourceforge.net/projects/sdlgfx/;
-
license = stdenv.lib.licenses.lgpl2Plus;
-
maintainers = [ stdenv.lib.maintainers.bjg ];
-
platforms = stdenv.lib.platforms.linux;
};
}
···
+
{ stdenv, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
+
name = "SDL2_gfx-${version}";
+
version = "1.0.1";
+
src = fetchurl {
+
url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz";
+
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
};
+
buildInputs = [ SDL2 ];
+
configureFlags = [ "--enable-mmx" ];
+
meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions";
longDescription = ''
···
code. Its is written in plain C and can be used in C++ code.
'';
+
homepage = "https://sourceforge.net/projects/sdlgfx/";
+
license = licenses.zlib;
+
maintainers = with maintainers; [ bjg ];
+
platforms = platforms.linux;
};
}
+6 -13
pkgs/development/libraries/SDL2_image/default.nix
···
{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }:
stdenv.mkDerivation rec {
-
name = "SDL2_image-2.0.1";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis";
};
-
buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib];
-
postInstall = ''
-
sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \
-
-e 's,"SDL_version.h",<SDL2/SDL_version.h>,' \
-
-e 's,"begin_code.h",<SDL2/begin_code.h>,' \
-
-e 's,"close_code.h",<SDL2/close_code.h>,' \
-
$out/include/SDL2/SDL_image.h
-
ln -sv SDL2/SDL_image.h $out/include/SDL_image.h
-
'';
-
-
meta = {
description = "SDL image library";
homepage = "http://www.libsdl.org/projects/SDL_image/";
-
platforms = stdenv.lib.platforms.linux;
};
}
···
{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }:
stdenv.mkDerivation rec {
+
name = "SDL2_image-${version}";
+
version = "2.0.1";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis";
};
+
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ];
+
meta = with stdenv.lib; {
description = "SDL image library";
homepage = "http://www.libsdl.org/projects/SDL_image/";
+
platforms = platforms.linux;
+
license = licenses.zlib;
};
}
+9 -8
pkgs/development/libraries/SDL2_mixer/default.nix
···
-
{ stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }:
stdenv.mkDerivation rec {
-
name = "SDL2_mixer-2.0.1";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
};
-
propagatedBuildInputs = [SDL2 libogg libvorbis];
-
configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl";
-
postInstall = "ln -s $out/include/SDL2/SDL_mixer.h $out/include/";
-
-
meta = {
description = "SDL multi-channel audio mixer library";
-
platforms = stdenv.lib.platforms.linux;
};
}
···
+
{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }:
stdenv.mkDerivation rec {
+
name = "SDL2_mixer-${version}";
+
version = "2.0.1";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
};
+
propagatedBuildInputs = [ SDL2 libogg libvorbis ];
+
configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
+
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";
+
platforms = platforms.linux;
+
homepage = "https://www.libsdl.org/projects/SDL_mixer/";
+
license = licenses.zlib;
};
}
+6 -7
pkgs/development/libraries/SDL2_net/default.nix
···
{ stdenv, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
-
name = "SDL2_net-2.0.0";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
-
sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab";
};
-
propagatedBuildInputs = [SDL2];
-
-
postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/";
meta = with stdenv.lib; {
description = "SDL multiplatform networking library";
-
homepage = https://www.libsdl.org/projects/SDL_net;
license = licenses.zlib;
-
maintainers = [ maintainers.MP2E ];
platforms = platforms.linux;
};
}
···
{ stdenv, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
+
name = "SDL2_net-${version}";
+
version = "2.0.1";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
+
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
};
+
propagatedBuildInputs = [ SDL2 ];
meta = with stdenv.lib; {
description = "SDL multiplatform networking library";
+
homepage = "https://www.libsdl.org/projects/SDL_net";
license = licenses.zlib;
+
maintainers = with maintainers; [ MP2E ];
platforms = platforms.linux;
};
}
+8 -7
pkgs/development/libraries/SDL2_ttf/default.nix
···
-
{ stdenv, fetchurl, SDL2, freetype }:
stdenv.mkDerivation rec {
-
name = "SDL2_ttf-2.0.14";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
};
-
buildInputs = [SDL2 freetype];
-
postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/";
-
-
meta = {
description = "SDL TrueType library";
-
platforms = stdenv.lib.platforms.linux;
};
}
···
+
{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }:
stdenv.mkDerivation rec {
+
name = "SDL2_ttf-${version}";
+
version = "2.0.14";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
};
+
buildInputs = [ SDL2 freetype mesa_noglu ];
+
meta = with stdenv.lib; {
description = "SDL TrueType library";
+
platforms = platforms.linux;
+
license = licenses.zlib;
+
homepage = "https://www.libsdl.org/projects/SDL_ttf/";
};
}
+9 -15
pkgs/development/libraries/SDL_gfx/default.nix
···
-
{stdenv, fetchurl, SDL} :
stdenv.mkDerivation rec {
-
name = "SDL_gfx-2.0.25";
src = fetchurl {
url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
···
buildInputs = [ SDL ] ;
-
configureFlags = "--disable-mmx";
-
-
postInstall = ''
-
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-
$out/include/SDL/*.h
-
-
ln -s $out/include/SDL/*.h $out/include/;
-
'';
-
meta = {
description = "SDL graphics drawing primitives and support functions";
longDescription =
···
code. Its is written in plain C and can be used in C++ code.
'';
-
homepage = https://sourceforge.net/projects/sdlgfx/;
-
license = stdenv.lib.licenses.lgpl2Plus;
-
maintainers = [ stdenv.lib.maintainers.bjg ];
-
platforms = stdenv.lib.platforms.unix;
};
}
···
+
{ stdenv, fetchurl, SDL }:
stdenv.mkDerivation rec {
+
name = "SDL_gfx-${version}";
+
version = "2.0.25";
src = fetchurl {
url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
···
buildInputs = [ SDL ] ;
+
configureFlags = [ "--disable-mmx" ];
+
meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions";
longDescription =
···
code. Its is written in plain C and can be used in C++ code.
'';
+
homepage = "https://sourceforge.net/projects/sdlgfx/";
+
license = licenses.zlib;
+
maintainers = with maintainers; [ bjg ];
+
platforms = platforms.unix;
};
}
+3 -11
pkgs/development/libraries/SDL_image/default.nix
···
{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
stdenv.mkDerivation rec {
-
name = "SDL_image-1.2.12";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
···
buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
-
postInstall = ''
-
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-
-e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
-
-e 's,"begin_code.h",<SDL/begin_code.h>,' \
-
-e 's,"close_code.h",<SDL/close_code.h>,' \
-
$out/include/SDL/SDL_image.h
-
ln -sv SDL/SDL_image.h $out/include/SDL_image.h
-
'';
-
meta = with stdenv.lib; {
description = "SDL image library";
-
homepage = http://www.libsdl.org/projects/SDL_image/;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
···
{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
stdenv.mkDerivation rec {
+
name = "SDL_image-${version}";
+
version = "1.2.12";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
···
buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
meta = with stdenv.lib; {
description = "SDL image library";
+
homepage = "http://www.libsdl.org/projects/SDL_image/";
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
+3 -15
pkgs/development/libraries/SDL_mixer/default.nix
···
-
{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }:
stdenv.mkDerivation rec {
pname = "SDL_mixer";
···
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
};
-
buildInputs = [SDL libogg libvorbis fluidsynth smpeg];
-
-
configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl";
-
-
postInstall = ''
-
ln -s $out/include/SDL/SDL_mixer.h $out/include/
-
for f in $out/include/SDL/SDL_mixer.h
-
do
-
for i in SDL_types.h SDL_rwops.h SDL_audio.h SDL_endian.h SDL_version.h begin_code.h close_code.h
-
do
-
substituteInPlace $f --replace "#include \"$i\"" "#include <SDL/$i>"
-
done
-
done
-
'';
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";
···
+
{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }:
stdenv.mkDerivation rec {
pname = "SDL_mixer";
···
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
};
+
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ];
+
configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl";
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";
+5 -14
pkgs/development/libraries/SDL_net/default.nix
···
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};
-
propagatedBuildInputs = [SDL];
-
postInstall = ''
-
sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \
-
-e 's,"SDL_endian.h",<SDL/SDL_endian.h>,' \
-
-e 's,"SDL_version.h",<SDL/SDL_version.h>,' \
-
-e 's,"begin_code.h",<SDL/begin_code.h>,' \
-
-e 's,"close_code.h",<SDL/close_code.h>,' \
-
$out/include/SDL/SDL_net.h
-
-
ln -sv $out/include/SDL/SDL_net.h $out/include/
-
'';
-
-
meta = {
description = "SDL networking library";
-
platforms = stdenv.lib.platforms.unix;
};
}
···
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};
+
propagatedBuildInputs = [ SDL ];
+
meta = with stdenv.lib; {
description = "SDL networking library";
+
platforms = platforms.unix;
+
license = licenses.zlib;
+
homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html";
};
}
+7 -6
pkgs/development/libraries/SDL_sound/default.nix
···
-
{stdenv, fetchurl, SDL, libvorbis, flac, libmikmod}:
stdenv.mkDerivation rec {
-
name = "SDL_sound-1.0.3";
src = fetchurl {
url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz";
···
buildInputs = [ SDL libvorbis flac libmikmod ];
-
postInstall = "ln -s $out/include/SDL/SDL_sound.h $out/include/";
-
-
meta = {
description = "SDL sound library";
-
platforms = stdenv.lib.platforms.linux;
};
}
···
+
{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }:
stdenv.mkDerivation rec {
+
name = "SDL_sound-${version}";
+
version = "1.0.3";
src = fetchurl {
url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz";
···
buildInputs = [ SDL libvorbis flac libmikmod ];
+
meta = with stdenv.lib; {
description = "SDL sound library";
+
platforms = platforms.linux;
+
license = licenses.lgpl21;
+
homepage = "https://www.icculus.org/SDL_sound/";
};
}
+7 -6
pkgs/development/libraries/SDL_stretch/default.nix
···
{ stdenv, fetchurl, SDL }:
-
stdenv.mkDerivation {
-
name = "SDL_stretch-0.3.1";
src = fetchurl {
-
url = "mirror://sourceforge/sdl-stretch/0.3.1/SDL_stretch-0.3.1.tar.bz2";
sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
};
buildInputs = [ SDL ];
-
meta = {
description = "Stretch Functions For SDL";
homepage = "http://sdl-stretch.sourceforge.net/";
-
license = stdenv.lib.licenses.lgpl2;
-
platforms = stdenv.lib.platforms.linux;
};
}
···
{ stdenv, fetchurl, SDL }:
+
stdenv.mkDerivation rec {
+
name = "SDL_stretch-${version}";
+
version = "0.3.1";
src = fetchurl {
+
url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2";
sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw";
};
buildInputs = [ SDL ];
+
meta = with stdenv.lib; {
description = "Stretch Functions For SDL";
homepage = "http://sdl-stretch.sourceforge.net/";
+
license = licenses.lgpl2;
+
platforms = platforms.linux;
};
}
+5 -3
pkgs/development/libraries/czmq/default.nix
···
{ stdenv, fetchurl, zeromq }:
stdenv.mkDerivation rec {
-
baseName="czmq";
-
version="3.0.2";
-
name="${baseName}-${version}";
src = fetchurl {
url = "http://download.zeromq.org/${name}.tar.gz";
sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
};
# Needs to be propagated for the .pc file to work
propagatedBuildInputs = [ zeromq ];
···
{ stdenv, fetchurl, zeromq }:
stdenv.mkDerivation rec {
+
version = "3.0.2";
+
name = "czmq-${version}";
src = fetchurl {
url = "http://download.zeromq.org/${name}.tar.gz";
sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb";
};
+
+
# Fix build on Glibc 2.24.
+
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
# Needs to be propagated for the .pc file to work
propagatedBuildInputs = [ zeromq ];
+4 -1
pkgs/development/libraries/kdevplatform/default.nix
···
sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";
};
-
patches = [ ./gettext.patch ];
propagatedBuildInputs = [ kdelibs qt4 phonon ];
buildInputs = [ apr aprutil subversion boost qjson grantlee ];
···
sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";
};
+
patches = [
+
./gettext.patch # build error caused by CMake update
+
./dependency.patch # build error: https://phabricator.kde.org/D1160
+
];
propagatedBuildInputs = [ kdelibs qt4 phonon ];
buildInputs = [ apr aprutil subversion boost qjson grantlee ];
+12
pkgs/development/libraries/kdevplatform/dependency.patch
···
···
+
diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
+
--- a/plugins/filetemplates/CMakeLists.txt
+
+++ b/plugins/filetemplates/CMakeLists.txt
+
@@ -81,6 +81,7 @@
+
)
+
+
kde4_add_executable(testfiletemplates ${test_srcs})
+
+add_dependencies(testfiletemplates kdevfiletemplates)
+
+
target_link_libraries(testfiletemplates
+
${KDE4_KDECORE_LIBS}
+
+2 -2
pkgs/development/libraries/libvirt/default.nix
···
];
preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
-
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd}/bin:$PATH
substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
'' + ''
···
--replace "$out/bin" "${gettext}/bin"
'' + stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/sbin/libvirtd \
-
--prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin
'';
enableParallelBuilding = true;
···
];
preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+
PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
'' + ''
···
--replace "$out/bin" "${gettext}/bin"
'' + stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/sbin/libvirtd \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]}
'';
enableParallelBuilding = true;
+1 -1
pkgs/development/libraries/phonon/backends/gstreamer.nix
···
NIX_CFLAGS_COMPILE = [
# This flag should be picked up through pkgconfig, but it isn't.
-
"-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
];
nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
···
NIX_CFLAGS_COMPILE = [
# This flag should be picked up through pkgconfig, but it isn't.
+
"-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
];
nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+13 -9
pkgs/development/libraries/physics/geant4/g4py/default.nix
···
--with-g4install-dir=${geant4} \
--with-python-incdir=${python}/include/python${python.majorVersion} \
--with-python-libdir=${python}/lib \
-
--with-boost-incdir=${boost}/include \
-
--with-boost-libdir=${boost}/lib
'';
enableParallelBuilding = true;
···
meta = {
description = "Python bindings and utilities for Geant4";
longDescription = ''
-
Geant4 is a toolkit for the simulation of the passage of particles through matter.
-
Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
-
The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
'';
homepage = http://www.geant4.org;
license = stdenv.lib.licenses.g4sl;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
-
};
};
fetchGeant4 = import ../fetch.nix {
inherit stdenv fetchurl;
-
};
in {
v10_0_2 = buildG4py {
inherit (fetchGeant4.v10_0_2) version src;
geant4 = geant4.v10_0_2;
-
};
-
}
···
--with-g4install-dir=${geant4} \
--with-python-incdir=${python}/include/python${python.majorVersion} \
--with-python-libdir=${python}/lib \
+
--with-boost-incdir=${boost.dev}/include \
+
--with-boost-libdir=${boost.out}/lib
'';
enableParallelBuilding = true;
···
meta = {
description = "Python bindings and utilities for Geant4";
longDescription = ''
+
Geant4 is a toolkit for the simulation of the passage of particles
+
through matter. Its areas of application include high energy,
+
nuclear and accelerator physics, as well as studies in medical and
+
space science. The two main reference papers for Geant4 are
+
published in Nuclear Instruments and Methods in Physics Research A
+
506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
+
(2006) 270-278.
'';
homepage = http://www.geant4.org;
license = stdenv.lib.licenses.g4sl;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
+
};
};
fetchGeant4 = import ../fetch.nix {
inherit stdenv fetchurl;
+
};
in {
v10_0_2 = buildG4py {
inherit (fetchGeant4.v10_0_2) version src;
geant4 = geant4.v10_0_2;
+
};
+
}
+3 -3
pkgs/development/libraries/science/math/clblas/cuda/default.nix
···
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
'';
-
configurePhase = ''
-
findInputs ${boost} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
···
mkdir -p Build
pushd Build
-
export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib"
cmake ../src -DCMAKE_INSTALL_PREFIX=$out \
-DCMAKE_BUILD_TYPE=Release \
···
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
'';
+
configurePhase = ''
+
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
···
mkdir -p Build
pushd Build
+
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}"
cmake ../src -DCMAKE_INSTALL_PREFIX=$out \
-DCMAKE_BUILD_TYPE=Release \
+1 -1
pkgs/development/libraries/wt/default.nix
···
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}"
-
"-DMYSQL_PREFIX=${libmysql}"
"--no-warn-unused-cli"
];
···
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"
"-DWT_CPP_11_MODE=-std=c++11"
"-DGM_PREFIX=${graphicsmagick}"
+
"-DMYSQL_PREFIX=${libmysql.dev}"
"--no-warn-unused-cli"
];
+1 -1
pkgs/development/mobile/androidenv/androidndk_r8e.nix
···
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-
--set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ndk-gdb ndk-gdb-py
do
···
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
+
--set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ndk-gdb ndk-gdb-py
do
+3 -3
pkgs/development/mobile/androidenv/androidsdk.nix
···
wrapProgram `pwd`/uiautomatorviewer \
--prefix PATH : ${jdk}/bin \
-
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
wrapProgram `pwd`/hierarchyviewer \
--prefix PATH : ${jdk}/bin \
-
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
# The emulators need additional libraries, which are dynamically loaded => let's wrap them
···
for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service
do
wrapProgram `pwd`/$i \
-
--prefix PATH : ${file}/bin:${glxinfo}/bin \
--suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb
done
···
wrapProgram `pwd`/uiautomatorviewer \
--prefix PATH : ${jdk}/bin \
+
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}
wrapProgram `pwd`/hierarchyviewer \
--prefix PATH : ${jdk}/bin \
+
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]}
# The emulators need additional libraries, which are dynamically loaded => let's wrap them
···
for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service
do
wrapProgram `pwd`/$i \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
--suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb
done
+1 -1
pkgs/development/mobile/flashtool/default.nix
···
sed -i \
-e 's|$(uname -m)|i686|' \
-e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
-
-e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
FlashTool FlashToolConsole
'';
···
sed -i \
-e 's|$(uname -m)|i686|' \
-e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
+
-e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
FlashTool FlashToolConsole
'';
+1 -1
pkgs/development/python-modules/libgpuarray/cuda/default.nix
···
function fixRunPath {
p=$(patchelf --print-rpath $1)
-
patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1
}
fixRunPath Install/lib/libgpuarray.so
···
function fixRunPath {
p=$(patchelf --print-rpath $1)
+
patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1
}
fixRunPath Install/lib/libgpuarray.so
+1 -1
pkgs/development/python-modules/pycuda/default.nix
···
};
preConfigure = ''
-
findInputs ${boost} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
···
};
preConfigure = ''
+
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib
+9 -4
pkgs/development/ruby-modules/gem/gem-post-build.rb
···
out = ENV["out"]
bin_path = File.join(ENV["out"], "bin")
gem_home = ENV["GEM_HOME"]
-
gem_path = ENV["GEM_PATH"].split(":")
install_path = Dir.glob("#{gem_home}/gems/*").first
gemspec_path = ARGV[0]
···
# this file is here to facilitate running it.
#
-
Gem.use_paths "#{gem_home}", #{gem_path.to_s}
-
require 'rubygems'
-
load Gem.bin_path(#{spec.name.inspect}, #{exe.inspect})
EOF
end
···
out = ENV["out"]
bin_path = File.join(ENV["out"], "bin")
gem_home = ENV["GEM_HOME"]
+
gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
install_path = Dir.glob("#{gem_home}/gems/*").first
gemspec_path = ARGV[0]
···
# this file is here to facilitate running it.
#
+
require 'rubygems'
+
Gem.paths = {
+
'GEM_PATH' => (
+
ENV['GEM_PATH'].to_s.split(File::PATH_SEPARATOR) +
+
#{([gem_home] + gem_path).to_s}
+
).join(File::PATH_SEPARATOR)
+
}
+
load Gem.activate_bin_path(#{spec.name.inspect}, #{exe.inspect}, #{spec.version.to_s.inspect})
EOF
end
+11 -2
pkgs/development/tools/build-managers/gradle/default.nix
···
};
};
-
gradleLatest = gradleGen rec {
name = "gradle-2.14.1";
src = fetchurl {
···
};
};
-
gradle25 = gradleGen rec {
name = "gradle-2.5";
src = fetchurl {
···
};
};
+
gradle_latest = gradleGen rec {
+
name = "gradle-3.0";
+
+
src = fetchurl {
+
url = "http://services.gradle.org/distributions/${name}-bin.zip";
+
sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r";
+
};
+
};
+
+
gradle_2_14 = gradleGen rec {
name = "gradle-2.14.1";
src = fetchurl {
···
};
};
+
gradle_2_5 = gradleGen rec {
name = "gradle-2.5";
src = fetchurl {
-23
pkgs/development/tools/build-managers/leiningen/builder.sh
···
-
#!/bin/bash
-
-
source $stdenv/setup
-
-
mkdir -pv $out/bin $out/share/java
-
-
out_bin=$out/bin/lein
-
-
cp -v $src $out_bin
-
cp -v $jarsrc "$out/share/java/$name-standalone.jar"
-
-
for p in $patches;
-
do
-
patch --verbose $out_bin -p0 < $p
-
done
-
chmod -v 755 $out_bin
-
-
patchShebangs $out
-
-
wrapProgram $out_bin \
-
--prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \
-
--set LEIN_GPG ${gnupg1compat}/bin/gpg \
-
--set JAVA_CMD ${jdk}/bin/java
···
+23 -6
pkgs/development/tools/build-managers/leiningen/default.nix
···
{ stdenv, fetchurl, makeWrapper
-
, coreutils, findutils, jdk, rlwrap, gnupg1compat }:
stdenv.mkDerivation rec {
pname = "leiningen";
···
sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p";
};
-
patches = [ ./lein-fix-jar-path.patch ];
-
inherit rlwrap gnupg1compat findutils coreutils jdk;
-
builder = ./builder.sh;
-
buildInputs = [ makeWrapper ];
-
propagatedBuildInputs = [ jdk ];
meta = {
homepage = http://leiningen.org/;
···
{ stdenv, fetchurl, makeWrapper
+
, coreutils, jdk, rlwrap, gnupg1compat }:
stdenv.mkDerivation rec {
pname = "leiningen";
···
sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p";
};
+
JARNAME = "${name}-standalone.jar";
+
+
unpackPhase = "true";
+
+
buildInputs = [ makeWrapper ];
+
propagatedBuildInputs = [ jdk ];
+
+
installPhase = ''
+
mkdir -p $out/bin $out/share/java
+
cp -v $src $out/bin/lein
+
cp -v $jarsrc $out/share/java/$JARNAME
+
'';
+
fixupPhase = ''
+
chmod +x $out/bin/lein
+
patchShebangs $out/bin/lein
+
substituteInPlace $out/bin/lein \
+
--replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME"
+
wrapProgram $out/bin/lein \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
+
--set LEIN_GPG ${gnupg1compat}/bin/gpg \
+
--set JAVA_CMD ${jdk}/bin/java
+
'';
meta = {
homepage = http://leiningen.org/;
-4
pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch
···
-
46c47
-
< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
-
---
-
> LEIN_JAR=$(find $(dirname $0)/../share/java -name *-standalone.jar | head -n 1)
···
+3 -3
pkgs/development/tools/build-managers/redo/default.nix
···
stdenv.mkDerivation rec {
name = "redo-1.2";
src = fetchurl {
-
url = "http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/${name}.tar.bz2";
-
sha256 = "0hfbiljmgl821a0sf7abrfx29f22ahrgs86mrlrm8m95s7387kpp";
};
nativeBuildInputs = [ perl /* for pod2man */ ];
···
'';
meta = {
-
homepage = http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/redo.html;
description = "A system for building target files from source files";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.vrthra ];
···
stdenv.mkDerivation rec {
name = "redo-1.2";
src = fetchurl {
+
url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz";
+
sha256 = "0qr8plllxfn32r4rgnalzlhcs3b4l8a4ga8ig9v8i5iy1qnfhqnf";
};
nativeBuildInputs = [ perl /* for pod2man */ ];
···
'';
meta = {
+
homepage = https://jdebp.eu./Softwares/redo/;
description = "A system for building target files from source files";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.vrthra ];
+1 -1
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
···
substituteInPlace $out/share/bootstrap.sh \
--replace "#!/bin/bash" "#!$(type -P bash)"
wrapProgram $out/bin/buildkite-agent \
-
--set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'
'';
meta = {
···
substituteInPlace $out/share/bootstrap.sh \
--replace "#!/bin/bash" "#!$(type -P bash)"
wrapProgram $out/bin/buildkite-agent \
+
--set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"'
'';
meta = {
+1 -1
pkgs/development/tools/continuous-integration/cide/default.nix
···
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/cide $out/bin/cide \
-
--set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
'';
meta = with lib; {
···
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/cide $out/bin/cide \
+
--set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
'';
meta = with lib; {
+1 -1
pkgs/development/tools/haskell/ihaskell/wrapper.nix
···
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
-
export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
'';
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
···
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
+
export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
'';
profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
+1 -1
pkgs/development/tools/misc/autobuild/default.nix
···
postInstall = ''
wrapProgram $out/bin/ab{put,build}-sourceforge \
-
--prefix PATH ":" "${openssh}/bin:${rsync}/bin"
'';
meta = {
···
postInstall = ''
wrapProgram $out/bin/ab{put,build}-sourceforge \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}"
'';
meta = {
+4 -5
pkgs/development/tools/misc/distcc/masq.nix
···
stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}";
-
meta = {
-
platforms = stdenv.lib.platforms.linux;
-
};
-
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/bin
···
ln -sf $bbin/*-as $out/bin/as
done
fi
-
'';
}
···
stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}";
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/bin
···
ln -sf $bbin/*-as $out/bin/as
done
fi
'';
+
+
meta = {
+
platforms = stdenv.lib.platforms.linux;
+
};
}
+1 -1
pkgs/development/tools/misc/drush/default.nix
···
mkdir -p "$out"
cp -r . "$out/src"
mkdir "$out/bin"
-
wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin"
ln -s "$out/src/drush" "$out/bin/drush"
'';
}
···
mkdir -p "$out"
cp -r . "$out/src"
mkdir "$out/bin"
+
wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}"
ln -s "$out/src/drush" "$out/bin/drush"
'';
}
+6 -2
pkgs/development/tools/misc/indent/default.nix
···
url = "mirror://gnu/indent/${name}.tar.gz";
sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
};
-
meta = {
homepage = https://www.gnu.org/software/indent/;
description = "A source code reformatter";
license = stdenv.lib.licenses.gpl3Plus;
-
platforms = stdenv.lib.platforms.linux;
};
}
···
url = "mirror://gnu/indent/${name}.tar.gz";
sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa";
};
+
+
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+
sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c
+
'';
+
meta = {
homepage = https://www.gnu.org/software/indent/;
description = "A source code reformatter";
license = stdenv.lib.licenses.gpl3Plus;
+
platforms = stdenv.lib.platforms.unix;
};
}
+1 -1
pkgs/development/tools/misc/kibana/default.nix
···
mv * $out/libexec/kibana/
rm -r $out/libexec/kibana/node
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
-
--prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'';
···
mv * $out/libexec/kibana/
rm -r $out/libexec/kibana/node
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'';
+1 -1
pkgs/development/tools/misc/opengrok/default.nix
···
cp -a * $out/
substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname
wrapProgram $out/bin/OpenGrok \
-
--prefix PATH : "${ctags}/bin:${git}/bin" \
--set JAVA_HOME "${jre}" \
--set OPENGROK_TOMCAT_BASE "/var/tomcat"
'';
···
cp -a * $out/
substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname
wrapProgram $out/bin/OpenGrok \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \
--set JAVA_HOME "${jre}" \
--set OPENGROK_TOMCAT_BASE "/var/tomcat"
'';
+1 -1
pkgs/games/0ad/default.nix
···
"-I${xproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
-
"-I${SDL}/include/SDL"
"-I${SDL2}/include/SDL2"
];
···
"-I${xproto}/include/X11"
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
+
"-I${SDL.dev}/include/SDL"
"-I${SDL2}/include/SDL2"
];
+5 -5
pkgs/games/armagetronad/default.nix
···
-
{stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, mesa, zlib} :
let
versionMajor = "0.2.8";
···
sha256 = "1s55irhg60fpmhy8wwxpdq7c45r1mqch6zpicyb2wf9ln60xgwnx";
};
-
NIX_LDFLAGS = "-lSDL_image";
-
configureFlags ="--disable-etc";
-
buildInputs = [SDL SDL_image libxml2 libjpeg mesa zlib];
meta = with stdenv.lib; {
-
homepage = http://armagetronad.org;
description = "An multiplayer networked arcade racing game in 3D similar to Tron";
license = licenses.gpl2;
platforms = platforms.linux;
···
+
{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, mesa, zlib }:
let
versionMajor = "0.2.8";
···
sha256 = "1s55irhg60fpmhy8wwxpdq7c45r1mqch6zpicyb2wf9ln60xgwnx";
};
+
NIX_LDFLAGS = [ "-lSDL_image" ];
+
configureFlags = [ "--disable-etc" ];
+
buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ];
meta = with stdenv.lib; {
+
homepage = "http://armagetronad.org";
description = "An multiplayer networked arcade racing game in 3D similar to Tron";
license = licenses.gpl2;
platforms = platforms.linux;
+5 -3
pkgs/games/arx-libertatis/default.nix
···
optipng imagemagick
];
-
preConfigure = ''
-
cmakeFlags="-DDATA_DIR_PREFIXES=$out/share"
-
'';
enableParallelBuilding = true;
···
optipng imagemagick
];
+
cmakeFlags = [
+
"-DDATA_DIR_PREFIXES=$out/share"
+
"-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert"
+
"-DImageMagick_mogrify_EXECUTABLE=${imagemagick.out}/bin/mogrify"
+
];
enableParallelBuilding = true;
+1 -1
pkgs/games/brogue/default.nix
···
prePatch = ''
sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
-
-e 's,sdl-config,${SDL}/bin/sdl-config,g'
sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
make clean
rm -rf src/libtcod*
···
prePatch = ''
sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
+
-e 's,sdl-config,${SDL.dev}/bin/sdl-config,g'
sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
make clean
rm -rf src/libtcod*
+12 -28
pkgs/games/commandergenius/default.nix
···
{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
-
, libvorbis, libogg, mesa, boost, curl, zlib, cmake }:
stdenv.mkDerivation rec {
name = "commandergenius-${version}";
-
version = "194beta";
src = fetchFromGitHub {
owner = "gerstrong";
repo = "Commander-Genius";
rev = "v${version}";
-
sha256 = "0qxqzlmadxklrhxilbqj7y94fmbv0byj6vgpl59lb77lgs4y4x47";
};
-
buildInputs = [ SDL2 SDL2_image pkgconfig libvorbis libogg mesa boost curl zlib cmake ];
-
-
patchPhase = ''
-
cat >> lib/GsKit/CMakeLists.txt <<EOF
-
execute_process(COMMAND sdl2-config --cflags
-
OUTPUT_VARIABLE CFLAGS)
-
string(REGEX REPLACE "^-I" "" CFLAGS2 \''${CFLAGS})
-
string(REGEX REPLACE " .*" "" SDLINC \''${CFLAGS2})
-
INCLUDE_DIRECTORIES(\''${SDLINC})
-
EOF
-
'';
-
-
configurePhase = ''
-
cmake -DUSE_SDL2=yes -DBUILD_TARGET=LINUX -DCMAKE_INSTALL_PREFIX:PATH=$out -DCPACK_PACKAGE_INSTALL_DIRECTORY=$out
-
sed -i 's_/usr/share_$out_g' cmake_install.cmake
-
sed -i 's_/usr/share_$out_g' src/cmake_install.cmake
-
'';
-
installTargets = [ ];
-
installPhase = ''
-
mkdir -p $out/bin
-
cp src/CGeniusExe $out/bin
'';
-
meta = {
description = "Modern Interpreter for the Commander Keen Games";
longdescription = ''
Commander Genius is an open-source clone of
···
are required to do so
'';
homepage = "https://github.com/gerstrong/Commander-Genius";
-
maintainers = with stdenv.lib.maintainers; [ hce ];
-
license = stdenv.lib.licenses.gpl2;
-
platforms = with stdenv.lib.platforms; linux;
};
}
···
{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
+
, libvorbis, mesa_noglu, boost, cmake }:
stdenv.mkDerivation rec {
name = "commandergenius-${version}";
+
version = "1822release";
src = fetchFromGitHub {
owner = "gerstrong";
repo = "Commander-Genius";
rev = "v${version}";
+
sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8";
};
+
buildInputs = [ SDL2 SDL2_image mesa_noglu boost libvorbis ];
+
nativeBuildInputs = [ cmake pkgconfig ];
+
postPatch = ''
+
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(sdl2-config --cflags)"
+
sed -i 's,APPDIR games,APPDIR bin,' src/install.cmake
'';
+
meta = with stdenv.lib; {
description = "Modern Interpreter for the Commander Keen Games";
longdescription = ''
Commander Genius is an open-source clone of
···
are required to do so
'';
homepage = "https://github.com/gerstrong/Commander-Genius";
+
maintainers = with maintainers; [ hce ];
+
license = licenses.gpl2;
+
platforms = platforms.linux;
};
}
+1 -1
pkgs/games/crawl/crawl_purify.patch
···
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
-
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for
···
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
+
+ SQLITE_INCLUDE_DIR := ${sqlite.dev}/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for
+2 -2
pkgs/games/dwarf-fortress/unfuck.nix
···
{ stdenv, fetchFromGitHub, cmake
-
, mesa_noglu, SDL, SDL_image, SDL_ttf, glew, openalSoft
, ncurses, glib, gtk2, libsndfile, zlib
}:
···
nativeBuildInputs = [ cmake ];
buildInputs = [
-
SDL SDL_image SDL_ttf glew openalSoft
ncurses gtk2 libsndfile zlib mesa_noglu
];
···
{ stdenv, fetchFromGitHub, cmake
+
, mesa_noglu, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft
, ncurses, glib, gtk2, libsndfile, zlib
}:
···
nativeBuildInputs = [ cmake ];
buildInputs = [
+
libSM SDL SDL_image SDL_ttf glew openalSoft
ncurses gtk2 libsndfile zlib mesa_noglu
];
+1 -1
pkgs/games/hedgewars/default.nix
···
'';
postInstall = ''
-
wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib
'';
meta = with stdenv.lib; {
···
'';
postInstall = ''
+
wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ mesa freeglut physfs ]}
'';
meta = with stdenv.lib; {
+2 -2
pkgs/games/openmw/default.nix
···
{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
-
, giflib, pkgconfig }:
let
openscenegraph_ = openscenegraph.override {
···
enableParallelBuilding = true;
-
buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig ];
meta = with stdenv.lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
···
{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
+
, giflib, libXt, pkgconfig }:
let
openscenegraph_ = openscenegraph.override {
···
enableParallelBuilding = true;
+
buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig libXt ];
meta = with stdenv.lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
+1 -1
pkgs/games/spring/default.nix
···
postInstall = ''
wrapProgram "$out/bin/spring" \
-
--prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib::${systemd}/lib"
'';
meta = with stdenv.lib; {
···
postInstall = ''
wrapProgram "$out/bin/spring" \
+
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc systemd ]}"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/games/super-tux-kart/default.nix
···
{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-
, fribidi, autoconf, automake, libtool, bluez, libjpeg }:
stdenv.mkDerivation rec {
name = "supertuxkart-${version}";
···
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext
-
libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg
];
enableParallelBuilding = true;
···
{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
+
, fribidi, autoconf, automake, libtool, bluez, libjpeg, libpng }:
stdenv.mkDerivation rec {
name = "supertuxkart-${version}";
···
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext
+
libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg libpng
];
enableParallelBuilding = true;
+6 -2
pkgs/games/the-powder-toy/default.nix
···
-
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat }:
stdenv.mkDerivation rec {
name = "the-powder-toy-${version}";
···
patches = [ ./fix-env.patch ];
nativeBuildInputs = [ scons pkgconfig ];
-
buildInputs = [ SDL lua fftwFloat ];
buildPhase = "scons DESTDIR=$out/bin --tool='' -j$NIX_BUILD_CORES";
···
+
{ stdenv, fetchFromGitHub, scons, pkgconfig, SDL, lua, fftwFloat, zlib, bzip2 }:
stdenv.mkDerivation rec {
name = "the-powder-toy-${version}";
···
patches = [ ./fix-env.patch ];
+
postPatch = ''
+
sed -i 's,lua5.1,lua,g' SConscript
+
'';
+
nativeBuildInputs = [ scons pkgconfig ];
+
buildInputs = [ SDL lua fftwFloat zlib bzip2 ];
buildPhase = "scons DESTDIR=$out/bin --tool='' -j$NIX_BUILD_CORES";
+1 -1
pkgs/games/tibia/default.nix
···
cp -r * $out/res
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-
--set-rpath ${stdenv.cc.cc.lib}/lib:${libX11}/lib:${mesa}/lib \
"$out/res/Tibia"
# We've patchelf'd the files. The main ‘Tibia’ binary is a bit
···
cp -r * $out/res
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
+
--set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 mesa ]} \
"$out/res/Tibia"
# We've patchelf'd the files. The main ‘Tibia’ binary is a bit
+10 -9
pkgs/games/xpilot/bloodspilot-client.nix
···
-
{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}:
-
let
-
buildInputs = [
-
libX11 SDL SDL_ttf SDL_image mesa expat
-
];
-
in
stdenv.mkDerivation rec {
version = "1.5.0";
name = "bloodspilot-client-${version}";
-
inherit buildInputs;
src = fetchurl {
url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj";
};
-
NIX_LDFLAGS=["-lX11"];
meta = {
-
inherit version;
description = ''A multiplayer space combat game (client part)'';
homepage = "http://bloodspilot.sf.net/";
license = stdenv.lib.licenses.gpl2Plus ;
···
+
{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }:
+
stdenv.mkDerivation rec {
version = "1.5.0";
name = "bloodspilot-client-${version}";
+
src = fetchurl {
url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj";
};
+
+
buildInputs = [
+
libX11 SDL SDL_ttf SDL_image mesa expat zlib
+
];
+
+
NIX_LDFLAGS = [ "-lX11" ];
+
meta = {
description = ''A multiplayer space combat game (client part)'';
homepage = "http://bloodspilot.sf.net/";
license = stdenv.lib.licenses.gpl2Plus ;
+2 -2
pkgs/games/xpilot/default.nix
···
-
{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}:
let
buildInputs = [
-
libX11 SDL SDL_ttf SDL_image mesa expat
];
in
stdenv.mkDerivation rec {
···
+
{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}:
let
buildInputs = [
+
libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib
];
in
stdenv.mkDerivation rec {
+2 -2
pkgs/misc/cups/drivers/samsung/default.nix
···
my_patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-
--set-rpath ${cups}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
- ${arch}/{pstosecps,rastertospl,smfpnetdiscovery}
mkdir -p $out/etc/sane.d/dll.d/
···
mkdir -p $out/lib/sane
my_patchelf \
-
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib:${libusb}/lib:${libxml2}/lib \
- ${arch}/libsane-smfp.so*
install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
···
my_patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+
--set-rpath ${cups.out}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
- ${arch}/{pstosecps,rastertospl,smfpnetdiscovery}
mkdir -p $out/etc/sane.d/dll.d/
···
mkdir -p $out/lib/sane
my_patchelf \
+
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.lib.makeLibraryPath [ stdenv.glibc libusb libxml2 ] } \
- ${arch}/libsane-smfp.so*
install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
+1 -1
pkgs/misc/cups/filters.nix
···
# Ensure that bannertopdf can find the PDF templates in
# $out. (By default, it assumes that cups and cups-filters are
# installed in the same prefix.)
-
substituteInPlace config.h --replace ${cups}/share/cups/data $out/share/cups/data
# Ensure that gstoraster can find gs in $PATH.
substituteInPlace filter/gstoraster.c --replace execve execvpe
···
# Ensure that bannertopdf can find the PDF templates in
# $out. (By default, it assumes that cups and cups-filters are
# installed in the same prefix.)
+
substituteInPlace config.h --replace ${cups.out}/share/cups/data $out/share/cups/data
# Ensure that gstoraster can find gs in $PATH.
substituteInPlace filter/gstoraster.c --replace execve execvpe
+8 -4
pkgs/misc/emulators/higan/default.nix
···
stdenv.mkDerivation rec {
name = "higan-${version}";
-
version = "100";
sourceName = "higan_v${version}-source";
src = fetchurl {
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
-
sha256 = "1pp20dxv6y2brb144v8kxfkkn0rcd755rivgrbvzzgn3v9dgjprp";
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
};
···
install -m 755 icarus/out/icarus $out/bin/
install -m 755 higan/out/higan $out/bin/
install -m 644 higan/data/higan.desktop $out/share/applications/
-
install -m 644 higan/data/higan.png $out/share/pixmaps/
-
cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' higan/data/cheats.bml higan/profile/* $out/share/higan/
'';
fixupPhase = ''
···
stdenv.mkDerivation rec {
name = "higan-${version}";
+
version = "101";
sourceName = "higan_v${version}-source";
src = fetchurl {
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
+
sha256 = "04vr3fp0b3cwq7q8d9v60qmv08zpcsb5gqn1whl4fvwcxcl22by8";
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
};
···
install -m 755 icarus/out/icarus $out/bin/
install -m 755 higan/out/higan $out/bin/
install -m 644 higan/data/higan.desktop $out/share/applications/
+
install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png
+
install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png
+
cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
+
higan/data/cheats.bml $out/share/higan/
+
cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
+
higan/systems/* $out/share/higan/
'';
fixupPhase = ''
+1 -1
pkgs/misc/emulators/retrofe/default.nix
···
configurePhase = ''
cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \
-DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \
-
-DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base}/include/gstreamer-1.0'
'';
buildPhase = ''
···
configurePhase = ''
cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \
-DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \
+
-DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0'
'';
buildPhase = ''
+2 -2
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
···
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
-
version = "4.7.1";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-
sha256 = "0dl1zc4xb8lwrryrpwfqmbnwciypzpah8vkhsl5nx0l3qcck6n15";
};
kernelPatches = args.kernelPatches;
···
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
+
version = "4.7.2";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+
sha256 = "1234z4wzvrbyzql6cc8i4bq7bbbjgaxhys4fcnqzm14lavk3wjaq";
};
kernelPatches = args.kernelPatches;
+3 -3
pkgs/os-specific/linux/kernel/patches.nix
···
grsecurity_4_4 = throw "grsecurity stable is no longer supported";
grsecurity_testing = grsecPatch
-
{ kver = "4.7.1";
-
grrev = "201608161813";
-
sha256 = "0ppay8gv7ml7kajbin7gclhrpkmc6pggxcbzzngm7qwdjjk5pppj";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
···
grsecurity_4_4 = throw "grsecurity stable is no longer supported";
grsecurity_testing = grsecPatch
+
{ kver = "4.7.2";
+
grrev = "201608211829";
+
sha256 = "1a7pvmb57w7j9s4ww8xvzzijlpnr2i7nhm7jhgfz4n5w3jvxcny3";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
+1 -1
pkgs/servers/elasticmq/default.nix
···
cp bin/run.sh $out/bin/elasticmq
substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'
-
wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin"
'';
meta = {
···
cp bin/run.sh $out/bin/elasticmq
substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'
+
wrapProgram $out/bin/elasticmq --prefix PATH : "${stdenv.lib.makeBinPath [ which jre ]}"
'';
meta = {
+1 -1
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
···
buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ];
-
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs" "--exec-prefix=$out"];
installPhase = ''
mkdir -p $out/bin
···
buildInputs = [ apacheHttpd autoconf autoreconfHook automake curl glib lasso libtool libxml2 libxslt openssl pkgconfig xmlsec ];
+
configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"];
installPhase = ''
mkdir -p $out/bin
+1 -1
pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
···
preBuild = ''
cp Makefile.AP2 Makefile
-
makeFlags="top_dir=${apacheHttpd}/share prefix=$out"
'';
meta = {
···
preBuild = ''
cp Makefile.AP2 Makefile
+
makeFlags="top_dir=${apacheHttpd.dev}/share prefix=$out"
'';
meta = {
+2 -2
pkgs/servers/mail/postfix/default.nix
···
cp -rv installdir/etc $out
sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install
wrapProgram $out/libexec/postfix/post-install \
-
--prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin
wrapProgram $out/libexec/postfix/postfix-script \
-
--prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
'';
meta = {
···
cp -rv installdir/etc $out
sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install
wrapProgram $out/libexec/postfix/post-install \
+
--prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep ]}
wrapProgram $out/libexec/postfix/postfix-script \
+
--prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]}
'';
meta = {
+1 -1
pkgs/servers/misc/taskserver/default.nix
···
echo wrapping $i
makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \
-
--prefix PATH : ${gnutls}/bin/
done
'';
···
echo wrapping $i
makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ gnutls ]}
done
'';
+1 -1
pkgs/servers/monitoring/net-snmp/default.nix
···
postInstall = ''
for f in $out/lib/*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
-
sed 's|-L${openssl}|-L${openssl.out}|g' -i $f
done
'';
···
postInstall = ''
for f in $out/lib/*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
+
sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f
done
'';
+2 -2
pkgs/servers/nosql/neo4j/default.nix
···
mkdir -p "$out/bin"
makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \
-
--prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \
-
--prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin"
'';
meta = with stdenv.lib; {
···
mkdir -p "$out/bin"
makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ jre which gnused ]}"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/servers/openpts/default.nix
···
configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
-
NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss";
preInstall = ''
mkdir -p $out
···
description = "TCG Platform Trust Service (PTS)";
homepage = "ttp://sourceforge.jp/projects/openpts";
license = stdenv.lib.licenses.cpl10;
-
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
};
}
···
configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
+
NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss -Wno-deprecated-declarations";
preInstall = ''
mkdir -p $out
···
description = "TCG Platform Trust Service (PTS)";
homepage = "ttp://sourceforge.jp/projects/openpts";
license = stdenv.lib.licenses.cpl10;
+
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
};
}
+1 -1
pkgs/servers/xmpp/ejabberd/default.nix
···
inherit src;
-
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite}" ];
buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
···
inherit src;
+
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
+2 -2
pkgs/tools/X11/xpra/default.nix
···
--set XPRA_LOG_DIR "\$HOME/.xpra" \
--set XPRA_INSTALL_PREFIX "$out" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-
--prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
'';
preCheck = "exit 0";
···
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
# sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-
# sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
#'';
···
--set XPRA_LOG_DIR "\$HOME/.xpra" \
--set XPRA_INSTALL_PREFIX "$out" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
'';
preCheck = "exit 0";
···
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
# sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
+
# sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
#'';
+2 -2
pkgs/tools/X11/xpra/gtk3.nix
···
--set XKB_BINDIR "${xkbcomp}/bin" \
--set FONTCONFIG_FILE "${fontsConf}" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-
--prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
'';
preCheck = "exit 0";
···
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
# sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-
# sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
#'';
···
--set XKB_BINDIR "${xkbcomp}/bin" \
--set FONTCONFIG_FILE "${fontsConf}" \
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
'';
preCheck = "exit 0";
···
#postFixup = ''
# sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
# sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
+
# sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
#'';
+1 -1
pkgs/tools/admin/salt/default.nix
···
postPatch = ''
substituteInPlace "salt/utils/rsax931.py" \
-
--subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so"
'';
# The tests fail due to socket path length limits at the very least;
···
postPatch = ''
substituteInPlace "salt/utils/rsax931.py" \
+
--subst-var-by "libcrypto" "${openssl.out}/lib/libcrypto.so"
'';
# The tests fail due to socket path length limits at the very least;
+6 -2
pkgs/tools/audio/darkice/default.nix
···
in stdenv.mkDerivation rec {
name = "darkice-${version}";
-
version = "1.2";
src = fetchurl {
url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
-
sha256 = "0m5jzmja7a9x15zl1634bhxrg3rccph9rkar0rmz6wlw5nzakyxk";
};
configureFlags = [
···
# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
# "--with-twolame-prefix=${twolame}" ### missing: twolame
];
meta = {
homepage = http://darkice.org/;
···
in stdenv.mkDerivation rec {
name = "darkice-${version}";
+
version = "1.3";
src = fetchurl {
url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
+
sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
};
configureFlags = [
···
# "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
# "--with-twolame-prefix=${twolame}" ### missing: twolame
];
+
+
patches = [ ./fix-undeclared-memmove.patch ];
+
+
enableParallelBuilding = true;
meta = {
homepage = http://darkice.org/;
+13
pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
···
···
+
diff --git a/src/FaacEncoder.cpp b/src/FaacEncoder.cpp
+
index 1100226..3ab1805 100644
+
--- a/src/FaacEncoder.cpp
+
+++ b/src/FaacEncoder.cpp
+
@@ -36,7 +36,7 @@
+
// compile the whole file only if faac support configured in
+
#ifdef HAVE_FAAC_LIB
+
+
-
+
+#include <string.h>
+
+
#include "Exception.h"
+
#include "Util.h"
+1 -1
pkgs/tools/backup/bareos/default.nix
···
++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-
++ optional (libmysql != null) "--with-mysql=${libmysql}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}"
···
++ optional (openssl != null) "--with-openssl=${openssl.dev}"
++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}"
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
+
++ optional (libmysql != null) "--with-mysql=${libmysql.dev}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}"
+1 -1
pkgs/tools/backup/btrbk/default.nix
···
wrapProgram $out/sbin/btrbk \
--set PERL5LIB $PERL5LIB \
-
--prefix PATH ':' "${btrfs-progs}/bin:${bash}/bin/"
'';
meta = with stdenv.lib; {
···
wrapProgram $out/sbin/btrbk \
--set PERL5LIB $PERL5LIB \
+
--prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash ]}"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/tools/backup/duplicity/default.nix
···
python setup.py install --prefix=$out
wrapProgram $out/bin/duplicity \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
-
--prefix PATH : "${gnupg}/bin:${ncftp}/bin"
wrapProgram $out/bin/rdiffdir \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
'';
···
python setup.py install --prefix=$out
wrapProgram $out/bin/duplicity \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp ]}"
wrapProgram $out/bin/rdiffdir \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
'';
+1 -1
pkgs/tools/backup/store-backup/default.nix
···
for p in $out/bin/*
do wrapProgram "$p" \
--prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
-
--prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"
done
patchShebangs $out
···
for p in $out/bin/*
do wrapProgram "$p" \
--prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}"
done
patchShebangs $out
+1 -1
pkgs/tools/bluetooth/blueman/default.nix
···
++ lib.optional withPulseAudio libpulseaudio;
postPatch = lib.optionalString withPulseAudio ''
-
sed -i 's,CDLL(",CDLL("${libpulseaudio}/lib/,g' blueman/main/PulseAudioUtils.py
'';
pythonPath = with pythonPackages; [ dbus-python pygobject3 ];
···
++ lib.optional withPulseAudio libpulseaudio;
postPatch = lib.optionalString withPulseAudio ''
+
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
'';
pythonPath = with pythonPackages; [ dbus-python pygobject3 ];
+1 -1
pkgs/tools/cd-dvd/unetbootin/default.nix
···
cp unetbootin.desktop $out/share/applications
wrapProgram $out/bin/unetbootin \
-
--prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
'';
meta = with stdenv.lib; {
···
cp unetbootin.desktop $out/share/applications
wrapProgram $out/bin/unetbootin \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ which p7zip mtools ]}
'';
meta = with stdenv.lib; {
+1 -1
pkgs/tools/graphics/pdfread/default.nix
···
cp -R *.py pylrs $PYDIR
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
-
--prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin
'';
meta = with stdenv.lib; {
···
cp -R *.py pylrs $PYDIR
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
'';
meta = with stdenv.lib; {
+7 -1
pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
···
-
{ stdenv, fetchurl, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
name = "fcitx-table-other-${version}";
···
};
buildInputs = [ cmake fcitx gettext ];
preInstall = ''
substituteInPlace tables/cmake_install.cmake \
···
+
{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }:
stdenv.mkDerivation rec {
name = "fcitx-table-other-${version}";
···
};
buildInputs = [ cmake fcitx gettext ];
+
+
patches = [
+
(fetchpatch { url = https://sources.debian.net/data/main/f/fcitx-table-other/0.2.3-3/debian/patches/0001-table-other-fix-build.patch;
+
sha256 = "06n1df9szfgfjm5al8r1mvp4cib5h0cm601kwngl6k1vqyyjzg1j";
+
})
+
];
preInstall = ''
substituteInPlace tables/cmake_install.cmake \
+3 -1
pkgs/tools/inputmethods/ibus/default.nix
···
buildInputs = [
python3 pygobject3
intltool isocodes pkgconfig
-
gtk2 gtk3 dconf glib
dbus libnotify gobjectIntrospection wayland
];
nativeBuildInputs = [ makeWrapper ];
···
buildInputs = [
python3 pygobject3
intltool isocodes pkgconfig
+
gtk2 gtk3 dconf
dbus libnotify gobjectIntrospection wayland
];
+
+
propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ makeWrapper ];
+1 -1
pkgs/tools/misc/disper/default.nix
···
postInstall = ''
wrapProgram $out/bin/disper \
-
--prefix "LD_LIBRARY_PATH" : "${xorg.libXrandr.out}/lib:${xorg.libX11.out}/lib"
'';
src = fetchurl {
···
postInstall = ''
wrapProgram $out/bin/disper \
+
--prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
'';
src = fetchurl {
+1 -1
pkgs/tools/misc/gparted/default.nix
···
wrapProgram $out/sbin/gparted \
--prefix PATH : "${procps}/bin"
wrapProgram $out/sbin/gpartedbin \
-
--prefix PATH : "${gpart}/bin:${hdparm}/bin:${utillinux}/bin"
'';
meta = with stdenv.lib; {
···
wrapProgram $out/sbin/gparted \
--prefix PATH : "${procps}/bin"
wrapProgram $out/sbin/gpartedbin \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}"
'';
meta = with stdenv.lib; {
+1 -1
pkgs/tools/misc/plowshare/default.nix
···
make PREFIX="$out" install
for fn in plow{del,down,list,up}; do
-
wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin"
done
'';
···
make PREFIX="$out" install
for fn in plow{del,down,list,up}; do
+
wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}"
done
'';
+1 -1
pkgs/tools/misc/profile-cleaner/default.nix
···
installPhase = ''
PREFIX=\"\" DESTDIR=$out make install
wrapProgram $out/bin/profile-cleaner \
-
--prefix PATH : "${parallel}/bin:${sqlite.bin}/bin"
'';
meta = {
···
installPhase = ''
PREFIX=\"\" DESTDIR=$out make install
wrapProgram $out/bin/profile-cleaner \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite ]}"
'';
meta = {
+1 -1
pkgs/tools/networking/dhcp/default.nix
···
buildInputs = [ perl makeWrapper openldap bind ];
configureFlags = [
-
"--with-libbind=${bind}"
"--enable-failover"
"--enable-execute"
"--enable-tracing"
···
buildInputs = [ perl makeWrapper openldap bind ];
configureFlags = [
+
"--with-libbind=${bind.dev}"
"--enable-failover"
"--enable-execute"
"--enable-tracing"
+1 -1
pkgs/tools/networking/lftp/default.nix
···
buildInputs = [ gnutls readline zlib libidn ];
configureFlags = [
-
"--with-readline=${readline}"
];
meta = with stdenv.lib; {
···
buildInputs = [ gnutls readline zlib libidn ];
configureFlags = [
+
"--with-readline=${readline.dev}"
];
meta = with stdenv.lib; {
+4 -13
pkgs/tools/networking/mosh/default.nix
···
, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
stdenv.mkDerivation rec {
-
name = "mosh-1.2.5";
src = fetchurl {
-
url = "http://mosh.mit.edu/${name}.tar.gz";
-
sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s";
};
buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
-
patches = [
-
# remove automake detection macro patch on next release as it is already on mosh master
-
(fetchpatch {
-
name = "fix_automake_detection_macro.patch";
-
url = "https://github.com/mobile-shell/mosh/commit/a47917b97606a03f6bbf0cafd1fcd495b0229790.patch";
-
sha256 = "0ib200ffvbnns125xd58947fyxdx31m06rmnzqmxpxcnjza7k404";
-
})
-
];
-
postInstall = ''
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
'';
meta = {
-
homepage = http://mosh.mit.edu/;
description = "Mobile shell (ssh replacement)";
longDescription = ''
Remote terminal application that allows roaming, supports intermittent
···
, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
stdenv.mkDerivation rec {
+
name = "mosh-1.2.6";
src = fetchurl {
+
url = "https://mosh.org/${name}.tar.gz";
+
sha256 = "118fhpm754wpklf1blnlq5xbvrxqml6rdfs3b07wg666zkxvg0ky";
};
buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
postInstall = ''
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
'';
meta = {
+
homepage = https://mosh.org/;
description = "Mobile shell (ssh replacement)";
longDescription = ''
Remote terminal application that allows roaming, supports intermittent
+2 -2
pkgs/tools/networking/network-manager-applet/default.nix
···
preFixup = ''
wrapProgram "$out/bin/nm-applet" \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
-
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${gnome3.gconf}/bin"
wrapProgram "$out/bin/nm-connection-editor" \
-
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
···
preFixup = ''
wrapProgram "$out/bin/nm-applet" \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
+
--prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${gnome3.gconf}/bin"
wrapProgram "$out/bin/nm-connection-editor" \
+
--prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
+2 -2
pkgs/tools/networking/offlineimap/default.nix
···
{ stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
pythonPackages.buildPythonApplication rec {
-
version = "7.0.5";
name = "offlineimap-${version}";
namePrefix = "";
···
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
-
sha256 = "0gmypc0sribxzglxgymfc5x3saxnkyhbky06dhxanxm6pa1p4blh";
};
doCheck = false;
···
{ stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
pythonPackages.buildPythonApplication rec {
+
version = "7.0.6";
name = "offlineimap-${version}";
namePrefix = "";
···
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
+
sha256 = "14hmr4f9zv1hhl6azh78rg4csincxzkp1sl4wydd4gwyb74cfpkc";
};
doCheck = false;
+1 -1
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
···
install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
-
--prefix PATH : ${coreutils}/bin:${gawk}/bin:${utillinux}/bin
'';
meta = {
···
install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}
'';
meta = {
+2 -2
pkgs/tools/networking/snabb/default.nix
···
done
# We need a way to pass $PATH to the scripts
-
sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
-
sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
'';
installPhase = ''
···
done
# We need a way to pass $PATH to the scripts
+
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
+
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
'';
installPhase = ''
+1 -1
pkgs/tools/networking/wicd/default.nix
···
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
-
sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
···
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
+
sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
+9 -10
pkgs/tools/networking/wrk/default.nix
···
-
{ stdenv, fetchgit, openssl }:
-
-
let
-
version = "4.0.0";
-
in stdenv.mkDerivation rec {
name = "wrk-${version}";
-
src = fetchgit {
-
url = "https://github.com/wg/wrk.git";
-
rev = "7cdede916a53da253c995767a92eec36a245a2cc";
-
sha256 = "1zk7mx27875wkbwcjpbl9zmpyyfic9177wmkif9a16mvj7mvlw9v";
};
-
buildInputs = [ openssl ];
installPhase = ''
mkdir -p $out/bin
···
+
{ stdenv, fetchFromGitHub, openssl, perl }:
+
stdenv.mkDerivation rec {
name = "wrk-${version}";
+
version = "4.0.2";
+
src = fetchFromGitHub {
+
owner = "wg";
+
repo = "wrk";
+
rev = version;
+
sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w";
};
+
buildInputs = [ openssl perl ];
installPhase = ''
mkdir -p $out/bin
+1 -1
pkgs/tools/security/prey/default.nix
···
cp -R . $out
cp -R ${modulesSrc}/* $out/modules/
wrapProgram "$out/prey.sh" \
-
--prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
--set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
'';
···
cp -R . $out
cp -R ${modulesSrc}/* $out/modules/
wrapProgram "$out/prey.sh" \
+
--prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \
--set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
'';
+2 -1
pkgs/tools/system/collectd/default.nix
···
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
-
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
meta = with stdenv.lib; {
description = "Daemon which collects system performance statistics periodically";
···
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
+
# Fix build on Glibc 2.24.
+
NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations";
meta = with stdenv.lib; {
description = "Daemon which collects system performance statistics periodically";
+1 -1
pkgs/tools/system/wsmancli/default.nix
···
./bootstrap
configureFlagsArray=(
-
LIBS="-L${openssl}/lib -lssl -lcrypto"
)
'';
···
./bootstrap
configureFlagsArray=(
+
LIBS="-L${openssl.out}/lib -lssl -lcrypto"
)
'';
+1 -1
pkgs/tools/typesetting/asciidoc/default.nix
···
# use it to work around an impurity in the tetex package; tetex tools
# cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
# We can remove PATH= when those impurities are fixed.
-
sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \
-e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
···
# use it to work around an impurity in the tetex package; tetex tools
# cannot find their neighbours (e.g. pdflatex doesn't find mktextfm).
# We can remove PATH= when those impurities are fixed.
+
sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${stdenv.lib.makeBinPath [ tetex coreutils gnused ]}')|" \
-e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
-e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
+1 -1
pkgs/tools/typesetting/djvu2pdf/default.nix
···
installPhase = ''
mkdir -p $out/bin
cp -p djvu2pdf $out/bin
-
wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin
mkdir -p $out/man/man1
cp -p djvu2pdf.1.gz $out/man/man1
···
installPhase = ''
mkdir -p $out/bin
cp -p djvu2pdf $out/bin
+
wrapProgram $out/bin/djvu2pdf --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript djvulibre which ]}
mkdir -p $out/man/man1
cp -p djvu2pdf.1.gz $out/man/man1
+1 -1
pkgs/tools/typesetting/docbook2odf/default.nix
···
sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"
wrapProgram "$out/bin/docbook2odf" \
-
--prefix PATH : "${zip}/bin:${libxslt}/bin" \
--prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}"
'';
···
sed -i "s|/usr/share/docbook2odf|$out/share/docbook2odf|" "$out/bin/docbook2odf"
wrapProgram "$out/bin/docbook2odf" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \
--prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}"
'';
+1 -1
pkgs/tools/typesetting/xmlto/default.nix
···
postInstall = ''
wrapProgram "$out/bin/xmlto" \
-
--prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin"
# `w3m' is needed for HTML to text conversions.
substituteInPlace "$out/share/xmlto/format/docbook/txt" \
···
postInstall = ''
wrapProgram "$out/bin/xmlto" \
+
--prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}"
# `w3m' is needed for HTML to text conversions.
substituteInPlace "$out/share/xmlto/format/docbook/txt" \
+2
pkgs/tools/video/mjpegtools/default.nix
···
buildInputs = [ libdv libjpeg libpng pkgconfig ]
++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ];
postPatch = ''
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
'';
···
buildInputs = [ libdv libjpeg libpng pkgconfig ]
++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ];
+
NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL}/include/SDL";
+
postPatch = ''
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
'';
+1 -1
pkgs/tools/virtualization/ec2-ami-tools/default.nix
···
for i in $out/bin/*; do
wrapProgram $i \
--set EC2_HOME $out \
-
--prefix PATH : ${ruby}/bin:${openssl.bin}/bin
done
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
···
for i in $out/bin/*; do
wrapProgram $i \
--set EC2_HOME $out \
+
--prefix PATH : ${stdenv.lib.makeBinPath [ ruby openssl ]}
done
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
+1
pkgs/top-level/aliases.nix
···
bundler_HEAD = bundler; # added 2015-11-15
checkbashism = checkbashisms; # added 2016-08-16
cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
conkerorWrapper = conkeror; # added 2015-01
···
bundler_HEAD = bundler; # added 2015-11-15
checkbashism = checkbashisms; # added 2016-08-16
cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
+
cifs_utils = cifs-utils; # added 2016-08
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
conkerorWrapper = conkeror; # added 2015-01
+19 -10
pkgs/top-level/all-packages.nix
···
openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8;
jdk7 = self.openjdk7 // { outputs = [ "out" ]; };
-
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (self.openjdk7.jre // { outputs = [ "jre" ]; });
jdk8 = self.openjdk8 // { outputs = [ "out" ]; };
-
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (self.openjdk8.jre // { outputs = [ "jre" ]; });
jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8;
jre = if stdenv.isDarwin then self.jre7 else self.jre8;
···
gotty = callPackage ../servers/gotty { };
gradleGen = callPackage ../development/tools/build-managers/gradle { };
-
gradle = self.gradleGen.gradleLatest;
-
gradle25 = self.gradleGen.gradle25;
gperf = callPackage ../development/tools/misc/gperf { };
···
oniguruma = callPackage ../development/libraries/oniguruma { };
-
openal = openalSoft;
openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
···
openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin;
-
pulseaudioSupport = if (config ? pulseaudio)
-
then config.pulseaudio
-
else stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
};
···
openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin;
-
pulseaudioSupport = config.pulseaudio or false; # better go through ALSA
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
};
···
checksec = callPackage ../os-specific/linux/checksec { };
-
cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
conky = callPackage ../os-specific/linux/conky ({
lua = lua5_1; # conky can use 5.2, but toluapp can not
···
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_2;
libva = libva-full; # also wants libva-x11
};
vlc_qt5 = qt5.vlc;
···
openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8;
jdk7 = self.openjdk7 // { outputs = [ "out" ]; };
+
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}"
+
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+
(self.openjdk7.jre // { outputs = [ "jre" ]; }));
jdk8 = self.openjdk8 // { outputs = [ "out" ]; };
+
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
+
(self.openjdk8.jre // { outputs = [ "jre" ]; }));
jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8;
jre = if stdenv.isDarwin then self.jre7 else self.jre8;
···
gotty = callPackage ../servers/gotty { };
gradleGen = callPackage ../development/tools/build-managers/gradle { };
+
gradle = self.gradleGen.gradle_latest;
+
gradle_2_14 = self.gradleGen.gradle_2_14;
+
gradle_2_5 = self.gradleGen.gradle_2_5;
gperf = callPackage ../development/tools/misc/gperf { };
···
oniguruma = callPackage ../development/libraries/oniguruma { };
+
openal = self.openalSoft;
+
openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
···
openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin;
+
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
};
···
openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin;
+
udevSupport = stdenv.isLinux;
+
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
};
···
checksec = callPackage ../os-specific/linux/checksec { };
+
cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
conky = callPackage ../os-specific/linux/conky ({
lua = lua5_1; # conky can use 5.2, but toluapp can not
···
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_2;
libva = libva-full; # also wants libva-x11
+
};
+
+
vlc_npapi = callPackage ../applications/video/vlc/plugin.nix {
+
gtk = gtk2;
};
vlc_qt5 = qt5.vlc;
+2 -2
pkgs/top-level/php-packages.nix
···
imagick31 = assert !isPhp7; buildPecl {
name = "imagick-3.1.2";
sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
-
configureFlags = "--with-imagick=${pkgs.imagemagick}";
buildInputs = [ pkgs.pkgconfig ];
};
imagick34 = buildPecl {
name = "imagick-3.4.0RC4";
sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
-
configureFlags = "--with-imagick=${pkgs.imagemagick}";
buildInputs = [ pkgs.pkgconfig ];
};
···
imagick31 = assert !isPhp7; buildPecl {
name = "imagick-3.1.2";
sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
+
configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ];
};
imagick34 = buildPecl {
name = "imagick-3.4.0RC4";
sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
+
configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ];
};
+1 -1
pkgs/top-level/python-packages.nix
···
checkPhase = ''
cd tests
-
export MAGICK_HOME="${pkgs.imagemagick}"
export PYTHONPATH=$PYTHONPATH:../
py.test
cd ..
···
checkPhase = ''
cd tests
+
export MAGICK_HOME="${pkgs.imagemagick.dev}"
export PYTHONPATH=$PYTHONPATH:../
py.test
cd ..