Merge branch 'staging' into staging-next

This commit is contained in:
Jan Tojnar 2019-12-31 03:59:58 +01:00
commit 0c2adc0fb1
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
352 changed files with 639 additions and 837 deletions

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

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 \

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" ];

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)" ];

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" ];

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

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

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

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;

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

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

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 \

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

View file

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

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}"

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

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 {}) // {

View file

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

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:") +

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

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 \

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

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

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

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

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

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

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;

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";
}

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

View file

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

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" ];

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 ]}

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

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

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

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 \

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"

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"

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

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

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

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

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

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.

View file

@ -156,7 +156,7 @@ 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) [
@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
]
++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68"
&& lib.versionOlder ffversion "69")
"-Wno-error=format-security";
"-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'
@ -176,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;

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;

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"
];

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

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

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

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

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

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"

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
})
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" ];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier";
meta = {
description = "An IRC proxy (bouncer)";

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 ]

View file

@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
++ optionals gpgSupport [ gpgme ]
++ optionals sslSupport [ openssl ];
configureFlags = [
(optional gpgSupport "--enable-gpgme")
(optional sslSupport "--enable-ssl")
];
configureFlags = optional gpgSupport "--enable-gpgme"
++ optional sslSupport "--enable-ssl";
meta = {
homepage = http://sylpheed.sraoss.jp/en/;

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
patches = [ ./10_fix_buffer_overflow_wordole_c.patch ];
installTargets = "global_install";
installTargets = [ "global_install" ];
meta = {
homepage = http://www.winfield.demon.nl/;

View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ dconf ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
patches = [ ./cmake_check_symbol_exists.patch ];

View file

@ -57,7 +57,7 @@ in (stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma");
NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal";
patches = [
./xdg-open-brief.patch

View file

@ -1 +1,4 @@
args: f: {}
{ stdenv, ... }:
attrs: {
NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma";
}

View file

@ -1,7 +1,6 @@
{ stdenv, ... }:
attrs:
{
NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE;
configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
}

View file

@ -46,7 +46,7 @@ in stdenv.mkDerivation {
];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
preConfigure = ''./autogen.sh'';
configureFlags = [

View file

@ -48,7 +48,7 @@ in {
wrapGAppsHook
];
buildInputs = [ atomEnv.packages gtk3 ];
buildInputs = atomEnv.packages ++ [ gtk3 ];
installPhase = ''
mkdir -p $out/bin

View file

@ -50,9 +50,7 @@ stdenv.mkDerivation rec {
Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
];
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
enableParallelBuilding = true;

View file

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

View file

@ -12,14 +12,14 @@ stdenv.mkDerivation {
};
buildInputs = [ cmake zlib boost.out boost.dev ];
NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]
NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ]
# Squelch endless stream of warnings on same few things
++ stdenv.lib.optionals stdenv.cc.isClang [
"-Wno-empty-body"
"-Wno-tautological-compare"
"-Wc++11-compat-deprecated-writable-strings"
"-Wno-deprecated"
];
]);
prePatch = ''
sed -i -e '1i#include <stdint.h>' abc/src/bdd/dsd/dsd.h

View file

@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ arpack spooles openblas ];
NIX_CFLAGS_COMPILE = [
"-I${spooles}/include/spooles"
];
NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles";
patches = [
./calculix.patch

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
makeWrapper ninja ant perl
];
ninjaFlags = "-C build/Opt";
ninjaFlags = [ "-C" "build/Opt" ];
postInstall = ''
for i in "$out"/bin/*; do

View file

@ -23,9 +23,7 @@ stdenv.mkDerivation {
"SVN_INCLUDE=${subversion.dev}/include/subversion-1"
];
NIX_LDFLAGS = [
"-lsvn_fs-1"
];
NIX_LDFLAGS = "-lsvn_fs-1";
meta = with stdenv.lib; {
homepage = https://github.com/svn-all-fast-export/svn2git;

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
make $checkFlags check || print_logs_and_fail
'';
NIX_CFLAGS_COMPILE = [ "-std=c99" ];
NIX_CFLAGS_COMPILE = "-std=c99";
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format";

View file

@ -108,9 +108,7 @@ stdenv.mkDerivation
# this is fixed upstream though not yet in an officially released version,
# should be fine remove on next release (if one ever happens)
NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = "-lpthread";
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";

View file

@ -100,9 +100,9 @@ stdenv.mkDerivation rec {
];
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [
NIX_LDFLAGS = toString [
"-lx265"
# NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
# NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
"-ldl"
];

View file

@ -71,10 +71,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
NIX_LDFLAGS = [
"-lavcodec"
"-lavutil"
];
NIX_LDFLAGS = "-lavcodec -lavutil";
patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ];

View file

@ -179,7 +179,7 @@ in stdenv.mkDerivation {
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional vdpauSupport libvdpau
++ lib.optional useWayland [
++ lib.optionals useWayland [
wayland waylandpp
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev
@ -192,7 +192,7 @@ in stdenv.mkDerivation {
which
pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optional useWayland [ wayland-protocols ];
] ++ lib.optionals useWayland [ wayland-protocols ];
cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}"

View file

@ -195,11 +195,11 @@ stdenv.mkDerivation rec {
echo CONFIG_MPEGAUDIODSP=yes >> config.mak
'';
NIX_LDFLAGS = with stdenv.lib;
NIX_LDFLAGS = with stdenv.lib; toString (
optional fontconfigSupport "-lfontconfig"
++ optional fribidiSupport "-lfribidi"
++ optionals x11Support [ "-lX11" "-lXext" ]
;
);
installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui";

View file

@ -34,7 +34,7 @@
}:
let
optional = stdenv.lib.optional;
inherit (stdenv.lib) optional optionals;
in mkDerivation rec {
pname = "obs-studio";
version = "24.0.4";
@ -46,9 +46,7 @@ in mkDerivation rec {
sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q";
};
nativeBuildInputs = [ cmake
pkgconfig
];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ curl
fdk_aac
@ -68,7 +66,7 @@ in mkDerivation rec {
makeWrapper
mbedtls
]
++ optional scriptingSupport [ luajit swig python3 ]
++ optionals scriptingSupport [ luajit swig python3 ]
++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio;

View file

@ -15,7 +15,10 @@
, pkgconfig
}:
buildGoPackage rec {
let
makeFlags = "BUILDTAGS=\"apparmor seccomp selinux
containers_image_ostree_stub\"";
in buildGoPackage rec {
project = "cri-o";
version = "1.16.1";
name = "${project}-${version}${flavor}";
@ -35,9 +38,6 @@ buildGoPackage rec {
libseccomp libselinux lvm2 ]
++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
makeFlags = ''BUILDTAGS="apparmor seccomp selinux
containers_image_ostree_stub"'';
buildPhase = ''
pushd go/src/${goPackagePath}

View file

@ -53,9 +53,7 @@ rec {
patchPhase = ''
'';
NIX_CFLAGS_COMPILE = [
"-DMINIMAL=ON"
];
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
});
in
stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) {

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = builtins.toString [
# igrone glib-2.62 deprecations
# Drop in next stable release.
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"

View file

@ -13,10 +13,7 @@ stdenv.mkDerivation rec {
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
NIX_CFLAGS_COMPILE = [
"-DPR_SET_CHILD_SUBREAPER=36"
"-DPR_GET_CHILD_SUBREAPER=37"
];
NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";
buildInputs = [ cmake glibc glibc.static ];

View file

@ -31,7 +31,7 @@ let
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
};
NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=stringop-truncation" ];
NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation";
});
in stdenv.mkDerivation {
pname = "virtualbox";

View file

@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec {
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
++ optional (withInternalOVMF) "--enable-ovmf";
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
# Fix build on Glibc 2.24.
"-Wno-error=deprecated-declarations"
# Fix build with GCC 8

View file

@ -167,7 +167,7 @@ callPackage (import ./generic.nix (rec {
xenpmdpatch
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
# Fix build on Glibc 2.24
"-Wno-error=deprecated-declarations"
# Fix build with GCC8

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libxdg_basedir
];
NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
mesonFlags = [
"-Dbuild_docs=true"

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors";
installTargets = [ "install-icons" "install-cursors" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''

View file

@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
source "$setupHook"
'';
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
postInstall = ''
# fix use of $out variable

View file

@ -16,5 +16,5 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ];
NIX_LDFLAGS = [ "-lgthread-2.0" ];
NIX_LDFLAGS = "-lgthread-2.0";
}

View file

@ -99,11 +99,9 @@ stdenv.mkDerivation rec {
"-Dudev_dir=${placeholder "out"}/lib/udev"
];
NIX_CFLAGS_COMPILE = [
# Default for release buildtype but passed manually because
# we're using plain
"-DG_DISABLE_CAST_CHECKS"
];
# Default for release buildtype but passed manually because
# we're using plain
NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
# So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
postFixup = ''

View file

@ -148,11 +148,9 @@ stdenv.mkDerivation rec {
"-Dudev_dir=${placeholder "out"}/lib/udev"
];
NIX_CFLAGS_COMPILE = [
# Default for release buildtype but passed manually because
# we're using plain
"-DG_DISABLE_CAST_CHECKS"
];
NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
passthru = {
updateScript = gnome3.updateScript {

View file

@ -9,7 +9,7 @@ mkXfceDerivation {
nativeBuildInputs = [ automakeAddFlags ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0" ];
NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0";
postPatch = ''
substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
/*
** We patch out a very annoying 'feature' in ./configure, which

View file

@ -11,13 +11,10 @@ ver: deps:
inherit (info) sha256;
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out
cp -r * $out
'';
};
in ''
mkdir -p .elm/${ver}/packages/${name}

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ];
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
NIX_CFLAGS_COMPILE = "-fPIC";
postPatch = ''
sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp

View file

@ -225,10 +225,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets =
if stripped
then "install-strip"
else "install";
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

View file

@ -231,10 +231,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets =
if stripped
then "install-strip"
else "install";
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

View file

@ -242,10 +242,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets =
if stripped
then "install-strip"
else "install";
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

View file

@ -250,10 +250,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets =
if stripped
then "install-strip"
else "install";
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

View file

@ -221,10 +221,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets =
if stripped
then "install-strip"
else "install";
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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