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

Merge pull request #76705 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk 2020-01-03 10:41:16 +01:00 committed by GitHub
commit 9ec439e009
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1210 changed files with 3501 additions and 4225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/go.xml
View File

@ -103,7 +103,7 @@ deis = buildGoPackage rec {
goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-3' />
buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' />
buildFlags = [ "--tags" "release" ]; <co xml:id='ex-buildGoPackage-4' />
}
</programlisting>
</example>

2
nixos/modules/services/x11/extra-layouts.nix
View File

@ -141,7 +141,7 @@ in
});
xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: {
configureFlags = "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb";
configureFlags = [ "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb" ];
});
};

10
pkgs/applications/audio/adlplug/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib
, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
, fetchpatch
, adlplugChip ? "-DADLplug_CHIP=OPL3"
, pname ? "ADLplug" }:
@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch";
sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy";
extraPrefix = "thirdparty/JUCE/";
stripLen = 1;
})
];
cmakeFlags = [ adlplugChip ];
buildInputs = [

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preBuild = "cd source";
makeFlags = "DESTDIR= PREFIX=$(out)";
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
meta = {
description = "Synthetized (not sampled) pipe organ emulator";

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

@ -62,7 +62,7 @@ multiStdenv.mkDerivation {
# Cf. https://github.com/phantom-code/airwave/issues/57
hardeningDisable = [ "format" ];
cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK";
cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ];
postInstall = ''
mv $out/bin $out/libexec

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

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
# audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually
NIX_LDFLAGS = [
NIX_LDFLAGS = toString [
# LAME
"-lmp3lame"
# ffmpeg

2
pkgs/applications/audio/avldrums-lv2/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
installFlags = "PREFIX=$(out)";
installFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [

2
pkgs/applications/audio/cd-discid/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
};
installFlags = "PREFIX=$(out) INSTALL=install";
installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
buildInputs = []
++ stdenv.lib.optional stdenv.isDarwin IOKit;

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

@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
patches = [ ./darwin-limits.patch ];
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot";
NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
postPatch = ''
substituteInPlace src/core/makefile.x/makefile.osx \

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

@ -77,7 +77,7 @@ let
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];
buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];

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

@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ]
++ stdenv.lib.optional stdenv.cc.isClang clangGCC
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
++ flatten (concatMap (a: a.deps) opts);
makeFlags = [ "LD=$(CC)" ];

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

@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
libXinerama libXrender ladspa-sdk
];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = http://distrho.sourceforge.net;

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

@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
})
];
installFlags = ''
DESTDIR=$(out)
'';
installFlags = [ "DESTDIR=$(out)" ];
fixupPhase = ''
cp -r $out/var/empty/local/lib $out

2
pkgs/applications/audio/foo-yc20/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 gtk2 lv2 faust ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
# remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved
postInstallFixup = "rm -rf $out/lib/lv2";

3
pkgs/applications/audio/freewheeling/default.nix
View File

@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ];
NIX_CFLAGS_COMPILE = toString
(makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]);
hardeningDisable = [ "format" ];

6
pkgs/applications/audio/jack-rack/default.nix
View File

@ -7,11 +7,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
NIX_LDFLAGS = [
"-ldl"
"-lm"
"-lpthread"
];
NIX_LDFLAGS = "-ldl -lm -lpthread";
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';

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

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = [ "-ldl" ];
NIX_LDFLAGS = "-ldl";
postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa

6
pkgs/applications/audio/lash/default.nix
View File

@ -18,11 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
pkgconfig readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = [
"-lm"
"-lpthread"
"-luuid"
];
NIX_LDFLAGS = "-lm -lpthread -luuid";
postInstall = ''
for i in lash_control lash_panel

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

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"PREFIX=${placeholder ''out''}"
];
NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ];
NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";
doCheck = true;

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

@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
++ opt midiSupport timidity
++ opt modplugSupport libmodplug
++ opt mp3Support libmad
++ opt musepackSupport [ libmpc libmpcdec taglib ]
++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ opt vorbisSupport libvorbis
++ opt speexSupport speex
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg

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

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;
installTargets = "install install-man";
installTargets = [ "install" "install-man" ];
meta = with stdenv.lib; {
description = "Command-line MP3 player";

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

@ -19,7 +19,7 @@ in stdenv.mkDerivation {
buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ]
++ stdenv.lib.optional usePulseAudio libpulseaudio;
configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ];
configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio";
meta = with stdenv.lib; {
description = "A cross-platform command-line based module file player";

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
libao json_c libgcrypt ffmpeg curl
];
makeFlags="PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
CC = "gcc";
CFLAGS = "-std=c99";

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

@ -17,7 +17,7 @@ stdenv.mkDerivation {
preConfigure = "cd src";
buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ];
NIX_LDFLAGS = [ "-lGL" "-lpthread" ];
NIX_LDFLAGS = "-lGL -lpthread";
postInstall = ''
wrapProgram $out/bin/pianobooster \

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

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
libXext
libXi
];
buildFlags = "linux-alsa";
buildFlags = [ "linux-alsa" ];
installPhase = ''
mkdir -p $out/bin

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

@ -31,7 +31,7 @@ stdenv.mkDerivation {
cp lang/*.bin $out/share/pico/lang
'';
NIX_CFLAGS_COMPILE = [ "-include stdint.h" ];
NIX_CFLAGS_COMPILE = "-include stdint.h";
meta = with stdenv.lib; {
description = "Text-to-speech engine";

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

@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
NIX_LDFLAGS = [
"-lm"
];
NIX_LDFLAGS = "-lm";
meta = {
description = "JACK audio recorder";

2
pkgs/applications/audio/vcv-rack/default.nix
View File

@ -79,7 +79,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
buildFlags = "Rack";
buildFlags = [ "Rack" ];
installPhase = ''
install -D -m755 -t $out/bin Rack

4
pkgs/applications/blockchains/aeon/default.nix
View File

@ -4,7 +4,7 @@
}:
let
version = "0.12.9.0";
version = "0.13.0.0";
in
stdenv.mkDerivation {
pname = "aeon";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
repo = "aeon";
rev = "v${version}-aeon";
fetchSubmodules = true;
sha256 = "194nxf8c8ihkmdsxyhkhrxc2xiinipifk0ng1rmxiiyr2gjgxzga";
sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch";
};
nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];

2
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
cppzmq hidapi randomx
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
patches = [ ./move-log-file.patch ];
postPatch = ''

2
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
'';
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
installFlags = [
"localstatedir=\${TMPDIR}"

2
pkgs/applications/editors/bviplus/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
ncurses
];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "CFLAGS=-fgnu89-inline" ];

2
pkgs/applications/editors/codeblocks/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ];
++ optionals contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ];
meta = {
maintainers = [ maintainers.linquize ];

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

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
done
'';
makeFlags = [
"-C src"
makeFlags = [
"-C" "src"
"prefix=${placeholder "out"}"
];

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

@ -77,7 +77,7 @@ in {
url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}";
inherit sha256;
};
packageRequires = lib.optional (! isNull deps)
packageRequires = lib.optionals (! isNull deps)
(map (dep: pkgargs.${dep} or self.${dep} or null)
deps);
meta = (sourceArgs.meta or {}) // {

2
pkgs/applications/editors/emacs/25.nix
View File

@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
done
'';
installTargets = "tags install";
installTargets = [ "tags" "install" ];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp

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

@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
};
src = [ ftesrc ftecommon ];
buildFlags = "PREFIX=$(out)";
buildFlags = [ "PREFIX=$(out)" ];
installFlags = "PREFIX=$(out) INSTALL_NONROOT=1";
installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ];
meta = with stdenv.lib; {
description = "A free text editor for developers";

3
pkgs/applications/editors/hexcurse/default.nix
View File

@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
};
buildInputs = [ ncurses ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ];
patches = [
# gcc7 compat
(fetchpatch {
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix";
})
];
meta = with lib; {
description = "ncurses-based console hexeditor written in C";
homepage = https://github.com/LonnyGomes/hexcurse;

2
pkgs/applications/editors/jucipp/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt
sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc
'';
cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so";
cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ];
postInstall = ''
mv $out/bin/juci $out/bin/.juci
makeWrapper "$out/bin/.juci" "$out/bin/juci" \

7
pkgs/applications/editors/nedit/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "nedit";
version = "5.7";
src = fetchurl {
url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz";
sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ xlibsWrapper ];
buildInputs = [ motif libXpm ];
buildFlags = if stdenv.isLinux then "linux" else
# the linux config works fine on darwin too!
if stdenv.isDarwin then "linux" else "";
# the linux config works fine on darwin too!
buildFlags = stdenv.lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux";
NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib";

2
pkgs/applications/editors/texmacs/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation {
git
python3
];
NIX_LDFLAGS = [ "-lz" ];
NIX_LDFLAGS = "-lz";
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +

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

@ -21,7 +21,7 @@ stdenv.mkDerivation {
'';
# For hacking purposes
env = yiEnv;
passthru.env = yiEnv;
meta = with stdenv.lib; {
description = "Allows Yi to find libraries and the compiler easily";

2
pkgs/applications/gis/grass/default.nix
View File

@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
done
'';
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
postInstall = ''
wrapProgram $out/bin/grass76 \

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

@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-base
] ++ stdenv.lib.optional useUnrar unrar;
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
postPatch = ''patchShebangs version.sh'';

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

@ -48,7 +48,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
};
NIX_LDFLAGS = [ "-lm" ];
NIX_LDFLAGS = "-lm";
patchPhase = ''
sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
@ -141,7 +141,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
Filters/Enhance/Wavelet sharpen
*/
name = "wavelet-sharpen-0.1.2";
NIX_LDFLAGS = [ "-lm" ];
NIX_LDFLAGS = "-lm";
src = fetchurl {
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ];
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
nativeBuildInputs = [ pkgconfig ];

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

@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
buildInputs = [ glfw3 gtk3 libpng12 ];
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
buildPhase = ''
make release

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

@ -18,9 +18,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
NIX_LDFLAGS = [
"-lm"
];
NIX_LDFLAGS = "-lm";
meta = with stdenv.lib; {
description = "A fast image viewer";

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

@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
#doCheck = false;
NIX_CFLAGS_COMPILE = [
"-Wno-deprecated-declarations"
];
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
meta = with stdenv.lib; {
description = "A 3D editor with support for procedural editing";

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "1.8.16";
version = "1.8.17";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps";
sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2";
};
outputs = [ "bin" "out" "dev" "doc" ];

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake qt4 fftw ];
cmakeFlags = "-DUSE_SYSTEM_FFTW=ON";
cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ];
meta = {
homepage = https://github.com/Y-Vladimir/SmartDeblur;

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

@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
NIX_LDFLAGS = [ "-lz" ]
++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ];
NIX_LDFLAGS = "-lz"
+ stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11";
desktopItem = makeDesktopItem {
name = name;

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

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
./switch.patch
];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
installPhase = ''
mkdir -p $out/bin

5
pkgs/applications/kde/print-manager.nix
View File

@ -22,8 +22,5 @@ mkDerivation {
outputs = [ "out" "dev" ];
# Fix build with cups deprecations etc.
# See: https://github.com/NixOS/nixpkgs/issues/73334
NIX_CFLAGS_COMPILE = [
"-Wno-error=deprecated-declarations"
"-Wno-error=format-security"
];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security";
}

20
pkgs/applications/misc/bibletime/default.nix
View File

@ -1,28 +1,30 @@
{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}:
{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
, qtbase, qttools, qtsvg, qtwebkit
}:
stdenv.mkDerivation rec {
version = "2.10.1";
version = "2.11.2";
pname = "bibletime";
src = fetchurl {
url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz";
sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6";
sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i";
};
prePatch = ''
patchShebangs .;
'';
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
sword boost clucene_core
qtbase qttools qtsvg qtwebkit
];
preConfigure = ''
export CLUCENE_HOME=${clucene_core};
export SWORD_HOME=${sword};
'';
buildInputs = [ cmake sword qt4 boost clucene_core ];
cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";
cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" "-DCMAKE_BUILD_TYPE=Debug" ];
meta = {
description = "A Qt4 Bible study tool";

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sed -i -e 's/ -Wno-format//g' Makefile
'';
makeFlags = "PREFIX=${placeholder "out"}";
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "Lightweight and fast battery icon that sits in the system tray";

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ python3 ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
preBuild = ''
# Version 1.7 was released as 1.6

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

@ -19,7 +19,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=format-security";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
meta = with stdenv.lib; {
homepage = http://doomseeker.drdteam.org/;

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

@ -59,9 +59,9 @@ stdenv.mkDerivation {
++ optional (uiType == "gtk") gtk2
++ optionals (uiType == "cocoa") [ AppKit Cocoa ];
makeFlags = "INSTALLDIR=$(out)";
makeFlags = [ "INSTALLDIR=$(out)" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
meta = with stdenv.lib; {
description = "An e-book reader for Linux";

6
pkgs/applications/misc/getxbook/default.nix
View File

@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ];
NIX_CFLAGS_COMPILE = builtins.toString [
"-Wno-error=format-truncation"
"-Wno-error=deprecated-declarations"
"-Wno-error=stringop-overflow"
];
buildInputs = [ openssl ];

2
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -31,7 +31,7 @@ in mkDerivation rec {
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
NIX_LDFLAGS = [ "-lz" ];
NIX_LDFLAGS = "-lz";
qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];

14
pkgs/applications/misc/gollum/default.nix
View File

@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
phases = [ "installPhase" ];
installPhase = ''
installPhase = let
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
in ''
mkdir -p $out/bin
makeWrapper ${env}/bin/gollum $out/bin/gollum \
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ python ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = "https://github.com/jarun/googler";

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
meta = {
description = "GTK-based audio CD player/ripper";

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

@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [

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

@ -15,7 +15,7 @@ buildGoModule rec {
modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs";
buildFlags = "-tags extended";
buildFlags = [ "-tags" "extended" ];
subPackages = [ "." ];

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

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libjpeg ];

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

@ -65,9 +65,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
installPhase = ''
install -D -m 755 k2pdfopt $out/bin/k2pdfopt

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

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
postInstall = ''
wrapProgram $out/bin/merkaartor \

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

@ -61,9 +61,7 @@ stdenv.mkDerivation rec {
"--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
#mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core
#and configuring ~/.mlterm/key correctly.
] ++ stdenv.lib.optional (libssh2 == null) [
"--disable-ssh2"
];
] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2";
postInstall = ''
install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -62,10 +62,8 @@ in stdenv.mkDerivation rec {
patchShebangs tools/get_wb_version.sh
'';
NIX_CFLAGS_COMPILE = [
# error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
"-Wno-error=deprecated-declarations"
];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
cmakeFlags = [
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"

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

@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
patches = [ ./CMakeLists.txt.patch ];
NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL"
++ optional speechdSupport "-I${speechd}/include/speech-dispatcher";
NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL"
++ optional speechdSupport "-I${speechd}/include/speech-dispatcher");
# we choose only cmdline and speech-dispatcher speech options.
# espeak builtins is made for non-cmdline OS as winCE

2
pkgs/applications/misc/netsurf/libcss/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem"
];
NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ];
NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough";
meta = with stdenv.lib; {
homepage = http://www.netsurf-browser.org/;

2
pkgs/applications/misc/notify-osd-customizable/default.nix
View File

@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
libtool
];
configureFlags = "--libexecdir=$(out)/bin";
configureFlags = [ "--libexecdir=$(out)/bin" ];
preFixup = ''
wrapProgram "$out/bin/notify-osd" \

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

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ xlibsWrapper ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man";
installTargets = [ "install" "install.man" ];
meta = with stdenv.lib; {
description = "Creates a cute cat chasing around your mouse cursor";

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

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"INSTALL_MANDIR=${placeholder ''out''}/share/man/man1"
];
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
buildInputs = [ libroxml proj libyamlcpp boost ];

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

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs librsvg pcre ];
cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF";
patches = [
# Fix build vala 0.46

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

@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = [ file ]
++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ];
++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
checkPhase = ''
py.test tests

2
pkgs/applications/misc/redis-desktop-manager/default.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
dontUseQmakeConfigure = true;
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ];
# Disable annoying update reminder
postPatch = ''
sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp

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

@ -1,6 +1,6 @@
{stdenv, fetchhg}:
let
s =
s =
rec {
baseName = "slmenu";
version = "hg-${date}";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchhg {
inherit (s) url sha256;
};
makeFlags = ''PREFIX=$(out)'';
makeFlags = [ "PREFIX=$(out)" ];
meta = {
inherit (s) version;
description = ''A console dmenu-like tool'';

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

@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp";
};
makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/pkg-config" "binary=stupidterm" ];
installPhase = ''
install -D stupidterm $out/bin/stupidterm

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

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
NIX_LDFLAGS = [ "-lm" ];
NIX_LDFLAGS = "-lm";
# bogus includes fail with newer library version
postPatch = ''

5
pkgs/applications/misc/taskjuggler/2.x/default.nix
View File

@ -56,9 +56,8 @@ stdenv.mkDerivation rec {
cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
'';
installFlags =
# kde_locale is not defined when installing without kde.
"kde_locale=\${out}/share/locale";
# kde_locale is not defined when installing without kde.
installFlags = [ "kde_locale=\${out}/share/locale" ];
meta = {
homepage = http://www.taskjuggler.org;

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

@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ];
NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]);
patches = [
./parse.patch # Fixes compilation error by avoiding redundant definitions.

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

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"MANDIR=${placeholder "man"}/share/man"
];
installTargets = "install install.man";
installTargets = [ "install" "install.man" ];
meta = {
description = "A keyboard layout indicator and switcher";

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

@ -156,12 +156,15 @@ stdenv.mkDerivation rec {
AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString ([
"-I${glib.dev}/include/gio-unix-2.0"
]
++ lib.optionals (!isTorBrowserLike) [
"-I${nss.dev}/include/nss"
];
]
++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68"
&& lib.versionOlder ffversion "69")
"-Wno-error=format-security");
postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
@ -173,7 +176,7 @@ stdenv.mkDerivation rec {
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ]
++ lib.optional (lib.versionAtLeast ffversion "61.0") python3
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0
++ extraNativeBuildInputs;

4
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -31,8 +31,8 @@ rustPlatform.buildRustPackage rec {
make
'';
NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ]
++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security";
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
+ stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
doCheck = true;

8
pkgs/applications/networking/ids/suricata/default.nix
View File

@ -109,12 +109,12 @@ stdenv.mkDerivation rec {
"--with-libnet-includes=${libnet}/include"
"--with-libnet-libraries=${libnet}/lib"
]
++ lib.optional hyperscanSupport [
++ lib.optionals hyperscanSupport [
"--with-libhs-includes=${hyperscan.dev}/include/hs"
"--with-libhs-libraries=${hyperscan}/lib"
]
++ lib.optional redisSupport [ "--enable-hiredis" ]
++ lib.optional rustSupport [
++ lib.optional redisSupport "--enable-hiredis"
++ lib.optionals rustSupport [
"--enable-rust"
"--enable-rust-experimental"
];
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
"sysconfdir=\${out}/etc"
];
installTargets = "install install-conf";
installTargets = [ "install" "install-conf" ];
postInstall = ''
wrapProgram "$out/bin/suricatasc" \

73
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -1,73 +0,0 @@
{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
, libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret
, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib
, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
stdenv.mkDerivation rec {
pname = "ekiga";
version = "4.0.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b";
};
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi
libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite
gnome3.libsoup glib gnome3.adwaita-icon-theme boost
autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1
gmp nettle makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]);
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme
'';
configureFlags = [
"--with-ldap-dir=${openldap.dev}"
"--with-libsasl2-dir=${cyrus_sasl.dev}"
"--with-boost-libdir=${boost.out}/lib"
"--disable-gconf"
];
enableParallelBuilding = true;
patches = [
(fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch;
sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4";
})
(fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch;
sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s";
})
(fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch;
sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz";
})
];
postInstall = ''
wrapProgram "$out"/bin/ekiga \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
passthru = {
updateInfo = {
downloadPage = "mirror://gnome/sources/ekiga";
};
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "VOIP/Videoconferencing app with full SIP and H.323 support";
homepage = "https://www.ekiga.org/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

16
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View File

@ -27,13 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g";
};
env = bundlerEnv {
name = "mikutter-${version}-gems";
gemdir = ./.;
inherit ruby;
};
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook ];
@ -44,7 +37,14 @@ stdenv.mkDerivation rec {
rm -rf vendor
'';
installPhase = ''
installPhase = let
env = bundlerEnv {
name = "mikutter-${version}-gems";
gemdir = ./.;
inherit ruby;
};
in ''
install -v -D -m644 README $out/share/doc/mikutter/README
install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE
rm -v README LICENSE

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

@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [pkgconfig];
buildInputs = [gtk2 glib pidgin];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
postPatch = ''
sed -e 's/-Wl,-soname//' -i Makefile

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm";
};
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = builtins.toString [
# glib-2.62 deprecations
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
# override "-O0 -Werror" set by build system

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt
'';
cmakeFlags = "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1";
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ];
meta = {
homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin;

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ];
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin libwebp libgcrypt gettext ];

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

@ -23,7 +23,7 @@ buildGoPackage rec {
buildInputs = [ trousers gtk3 gtkspell3 ]
++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi
++ stdenv.lib.optionals gui [ wrapGAppsHook ];
buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui";
buildFlags = stdenv.lib.optionals (!gui) [ "-tags" "nogui" ];
excludedPackages = "\\(appengine\\|bn256cgo\\)";
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 ''
grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv";
};
buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''

2
pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
patches = [ ./conference.patch ];
buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
NIX_LDFLAGS = [ "-lvorbis" ];
NIX_LDFLAGS = "-lvorbis";
meta = {
homepage = http://atdot.ch/scr/;

8
pkgs/applications/networking/instant-messengers/swift-im/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ GConf ];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-I${libxml2.dev}/include/libxml2"
"-I${miniupnpc}/include/miniupnpc"
"-I${qtwebkit.dev}/include/QtWebKit"
@ -31,10 +31,8 @@ stdenv.mkDerivation rec {
"-fpermissive"
];
preInstall = ''
installTargets="$out"
installFlags+=" SWIFT_INSTALLDIR=$out"
'';
installTargets = [ (placeholder "out") ];
installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ];
meta = with stdenv.lib; {
homepage = https://swift.im/;

14
pkgs/applications/networking/irc/bip/default.nix
View File

@ -23,9 +23,21 @@ stdenv.mkDerivation rec {
url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff";
sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb";
})
(fetchpatch {
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff";
sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0";
})
(fetchpatch {
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff";
sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i";
})
(fetchpatch {
url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff";
sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq";
})
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier";
meta = {
description = "An IRC proxy (bouncer)";

2
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -46,7 +46,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
enableParallelBuilding = true;
# Prevent ``undefined reference to `qt_version_tag''' in SSL check
NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1";
buildInputs =
[ cmake makeWrapper qtbase ]

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