philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

treewide: replace make/build/configure/patchFlags with nix lists

gstqt5
Merijn Broeren 2019-10-27 13:03:25 +00:00 committed by Jan Tojnar
parent 08d5fc3934
commit 133103d709
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
248 changed files with 336 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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;

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

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

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
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

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

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

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/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/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-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/irc/sic/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "sic";
version = "1.2";
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
src = fetchurl {
url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";

2
pkgs/applications/networking/mailreaders/mblaze/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
})
];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze

4
pkgs/applications/office/libreoffice/default.nix
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 = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma");
patches = [
./xdg-open-brief.patch
@ -248,7 +248,7 @@ in (stdenv.mkDerivation rec {
find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
'';
makeFlags = "SHELL=${bash}/bin/bash";
makeFlags = [ "SHELL=${bash}/bin/bash" ];
enableParallelBuilding = true;

2
pkgs/applications/radio/dmrconfig/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
--replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
'';
makeFlags = "VERSION=${version} GITCOUNT=0";
makeFlags = [ "VERSION=${version}" "GITCOUNT=0" ];
installPhase = ''
mkdir -p $out/bin $out/lib/udev/rules.d

2
pkgs/applications/science/biology/sumatools/default.nix
View File

@ -22,7 +22,7 @@ in rec {
rev = "sumalib_v${version}";
sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
inherit meta;
};

2
pkgs/applications/science/logic/coq/default.nix
View File

@ -143,7 +143,7 @@ self = stdenv.mkDerivation {
prefixKey = "-prefix ";
buildFlags = "revision coq coqide bin/votour";
buildFlags = [ "revision" "coq" "coqide" "bin/votour" ];
createFindlibDestdir = true;

2
pkgs/applications/science/logic/prover9/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
done
'';
buildFlags = "all";
buildFlags = [ "all" ];
checkPhase = "make test1";

2
pkgs/applications/science/math/msieve/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
ECM = if ecm == null then "0" else "1";
# Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too
makeFlags = "CC=cc all";
makeFlags = [ "CC=cc" "all" ];
installPhase = ''
mkdir -p $out/bin/

2
pkgs/applications/science/math/ries/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = https://mrob.com/pub/ries/;

2
pkgs/applications/science/math/scilab/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optional (!withXaw3d) "--with-local-xaw"
;
makeFlags = "all";
makeFlags = [ "all" ];
meta = {
homepage = http://www.scilab.org/;

2
pkgs/applications/science/misc/megam/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
makeFlags = "CAML_INCLUDES=${ocaml}/lib/ocaml/caml";
makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ];
# see https://bugzilla.redhat.com/show_bug.cgi?id=435559
dontStrip = true;

2
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
makeFlags = "PREFIX= DESTDIR=$(out)" ;
makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ;
meta = with stdenv.lib; {
homepage = https://github.com/mhagger/git-imerge;

2
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
buildInputs = [ python2 git ];
makeFlags = "prefix=$$out";
makeFlags = [ "prefix=$$out" ];
postInstall = ''
mkdir -p "$out/etc/bash_completion.d/"

2
pkgs/applications/version-management/gogs/default.nix
View File

@ -27,7 +27,7 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ]
++ optional pamSupport pam;
buildFlags = "-tags";
buildFlags = [ "-tags" ];
buildFlagsArray =
( optional sqliteSupport "sqlite"

2
pkgs/applications/version-management/mr/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Multiple Repository management tool";

2
pkgs/applications/virtualization/containerd/default.nix
View File

@ -17,7 +17,7 @@ buildGoPackage rec {
outputs = [ "bin" "out" "man" ];
buildInputs = [ btrfs-progs go-md2man utillinux ];
buildFlags = "VERSION=v${version}";
buildFlags = [ "VERSION=v${version}" ];
BUILDTAGS = []
++ optional (btrfs-progs == null) "no_btrfs";

4
pkgs/applications/virtualization/xen/generic.nix
View File

@ -187,11 +187,11 @@ stdenv.mkDerivation (rec {
'';
# 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 = [ "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_SCRIPT_DIR=/etc/xen/scripts" ]
++ (config.makeFlags or []);
buildFlags = "xen tools";
buildFlags = [ "xen" "tools" ];
postBuild = ''
make -C docs man-pages

4
pkgs/applications/window-managers/i3/blocks-gaps.nix
View File

@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "0v9307ij8xzwdaxay3r75sd2cp453s3qb6q7dy9fks2p6wwqpazi";
};
makeFlags = "all";
installFlags = "PREFIX=\${out} VERSION=${version}";
makeFlags = [ "all" ];
installFlags = [ "PREFIX=\${out}" "VERSION=${version}" ];
buildInputs = optional (contains_any scripts perlscripts) perl;
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ];
makeFlags = "all";
makeFlags = [ "all" ];
preInstall = ''
mkdir -p $out/share/man/man1
'';
installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man";
installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" "MANDIR=\${out}/share/man" ];
postInstall = ''
mv $out/bin/i3lock $out/bin/i3lock-color
mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1

4
pkgs/applications/window-managers/i3/lock.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm
pam libX11 libev cairo libxkbcommon libxkbfile ];
makeFlags = "all";
installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";
makeFlags = [ "all" ];
installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" ];
postInstall = ''
mkdir -p $out/share/man/man1
cp *.1 $out/share/man/man1

4
pkgs/applications/window-managers/ion-3/default.nix
View File

@ -13,6 +13,6 @@ stdenv.mkDerivation {
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ xlibsWrapper lua gettext groff ];
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
installFlags = [ "PREFIX=\${out}" ];
}

4
pkgs/applications/window-managers/notion/default.nix
View File

@ -35,8 +35,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft;
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
installFlags = "PREFIX=\${out}";
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
installFlags = [ "PREFIX=\${out}" ];
postInstall = ''
wrapProgram $out/bin/notion \

2
pkgs/applications/window-managers/wmii-hg/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help
makeFlags = "WMII_HGVERSION=hg${rev}";
makeFlags = [ "WMII_HGVERSION=hg${rev}" ];
meta = {
homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore

2
pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
./patches/mail-notification-dont-link-against-bsd-compat.patch
];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
NIX_CFLAGS_COMPILE = "-Wno-error";
preConfigure = "./jb configure prefix=$out";

2
pkgs/desktops/mate/mate-screensaver/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--without-console-kit" ];
makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc";
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
meta = with stdenv.lib; {
description = "Screen saver and locker for the MATE desktop";

4
pkgs/desktops/rox/rox-filer/default.nix
View File

@ -13,7 +13,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 gtk shared-mime-info libSM ];
NIX_LDFLAGS = [ "-ldl" "-lm" ];
NIX_LDFLAGS = "-ldl -lm";
patches = [
./rox-filer-2.11-in-source-build.patch
@ -23,7 +23,7 @@ in stdenv.mkDerivation {
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
# patch source with defined patches
patchFlags = "-p0";
patchFlags = [ "-p0" ];
# patch the main.c to disable the lookup of the APP_DIR environment variable,
# which is used to lookup the location for certain images when rox-filer

2
pkgs/desktops/xfce/core/xfce4-panel/default.nix
View File

@ -11,7 +11,7 @@ mkXfceDerivation {
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
patchFlags = [ "-p1" ];
postPatch = ''
for f in $(find . -name \*.sh); do

4
pkgs/development/compilers/chicken/4/chicken.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation {
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ];
# We need a bootstrap-chicken to regenerate the c-files after
# applying a patch to add support for CHICKEN_REPOSITORY_EXTRA

4
pkgs/development/compilers/chicken/5/chicken.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation {
setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
buildFlags = "PLATFORM=${platform} PREFIX=$(out)";
installFlags = "PLATFORM=${platform} PREFIX=$(out)";
buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ];
buildInputs = [
makeWrapper

2
pkgs/development/compilers/cmdstan/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
};
buildFlags = "build";
buildFlags = [ "build" ];
enableParallelBuilding = true;
doCheck = true;

2
pkgs/development/compilers/dev86/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Linux 8086 development environment";

2
pkgs/development/compilers/eli/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
];
# skip interactive browser check
buildFlags = "nobrowsers";
buildFlags = [ "nobrowsers" ];
preConfigure=''

4
pkgs/development/compilers/fpc/default.nix
View File

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
'' else "";
makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc";
makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ];
installFlags = "INSTALL_PREFIX=\${out}";
installFlags = [ "INSTALL_PREFIX=\${out}" ];
postInstall = ''
for i in $out/lib/fpc/*/ppc*; do

4
pkgs/development/compilers/fstar/default.nix
View File

@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
patchShebangs src/tools
patchShebangs bin
'';
buildFlags = "-C src/ocaml-output";
buildFlags = [ "-C" "src/ocaml-output" ];
preInstall = ''
mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib
'';
installFlags = "-C src/ocaml-output";
installFlags = [ "-C" "src/ocaml-output" ];
postInstall = ''
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
'';

2
pkgs/development/compilers/hhvm/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ];
prePatch = ''
substituteInPlace ./configure \

6
pkgs/development/compilers/iasl/default.nix
View File

@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
};
NIX_CFLAGS_COMPILE = [
"-O3"
];
NIX_CFLAGS_COMPILE = "-O3";
buildFlags = "iasl";
buildFlags = [ "iasl" ];
buildInputs = [ bison flex ];

2
pkgs/development/compilers/ocaml/3.10.0.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildFlags = [ "world" "bootstrap" "world.opt" ];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''

6
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@ -7,10 +7,10 @@ let
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.11.2";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
prePatch = ''

6
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@ -7,10 +7,10 @@ let
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.12.1";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];

10
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@ -3,22 +3,22 @@
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
inherit (stdenv.lib) optional optionals optionalString;
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "4.00.1";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper;
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
CAT=$(type -tp cat)

4
pkgs/development/compilers/ocaml/generic.nix
View File

@ -55,10 +55,10 @@ stdenv.mkDerivation (args // {
++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
;
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
++ optionals useX11 [ libX11 xorgproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang

2
pkgs/development/compilers/ocaml/metaocaml-3.09.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation ({
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = "world bootstrap world.opt";
buildFlags = [ "world" "bootstrap" "world.opt" ];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -745,7 +745,7 @@ self: super: {
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
'';
nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
makeFlags = "html";
makeFlags = [ "html" ];
installPhase = ''
mv _build/html $out
'';

2
pkgs/development/interpreters/kona/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''mkdir -p "$out/bin"'';
meta = with stdenv.lib; {

2
pkgs/development/interpreters/spidermonkey/1.8.5.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation {
./1.8.5-arm-flags.patch
];
patchFlags = "-p3";
patchFlags = [ "-p3" ];
# fixes build on gcc8
postPatch = ''

2
pkgs/development/libraries/blitz/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildFlags = "lib info pdf html";
buildFlags = [ "lib" "info" "pdf" "html" ];
installTargets = [ "install" "install-info" "install-pdf" "install-html" ];
inherit doCheck;

2
pkgs/development/libraries/cfitsio/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# Shared-only build
buildFlags = "shared";
buildFlags = [ "shared" ];
postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
'';

2
pkgs/development/libraries/cutee/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2";
};
buildFlags = "cutee";
buildFlags = [ "cutee" ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/development/libraries/filter-audio/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Lightweight audio filtering library made from webrtc code";

2
pkgs/development/libraries/gettext/default.nix
View File

@ -86,5 +86,5 @@ stdenv.mkDerivation rec {
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0";
makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ];
}

19
pkgs/development/libraries/hspell/dicts.nix
View File

@ -1,42 +1,39 @@
{ stdenv, hspell }:
let
dict = a: stdenv.mkDerivation ({
dict = variant: a: stdenv.mkDerivation ({
inherit (hspell) src patchPhase nativeBuildInputs;
meta = hspell.meta // {
broken = true;
description = "${a.buildFlags} Hebrew dictionary";
description = "${variant} Hebrew dictionary";
buildFlags = [ variant ];
} // (if a ? meta then a.meta else {});
} // (removeAttrs a ["meta"]));
in
{
recurseForDerivations = true;
aspell = dict {
aspell = dict "aspell" {
name = "aspell-dict-he-${hspell.version}";
buildFlags = "aspell";
installPhase = ''
mkdir -p $out/lib/aspell
cp -v he_affix.dat he.wl $out/lib/aspell'';
};
myspell = dict {
myspell = dict "myspell" {
name = "myspell-dict-he-${hspell.version}";
buildFlags = "myspell";
installPhase = ''
mkdir -p $out/lib/myspell
cp -v he.dic he.aff $out/lib/myspell'';
};
hunspell = dict {
hunspell = dict "hunspell" {
name = "hunspell-dict-he-${hspell.version}";
buildFlags = "hunspell";
installPhase = ''
mkdir -p $out/lib
cp -rv hunspell $out/lib'';

2
pkgs/development/libraries/libav/default.nix
View File

@ -103,7 +103,7 @@ let
setOutputFlags = false;
# alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc.
buildFlags = "all alltools install-man";
buildFlags = [ "all" "alltools" "install-man" ];
postInstall = ''

2
pkgs/development/libraries/libcef/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
makeFlags = "libcef_dll_wrapper";
makeFlags = [ "libcef_dll_wrapper" ];
dontStrip = true;
dontPatchELF = true;

2
pkgs/development/libraries/libcouchbase/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7";
};
cmakeFlags = "-DLCB_NO_MOCK=ON";
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevent openssl ];

2
pkgs/development/libraries/libexecinfo/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
installPhase = ''
install -Dm644 execinfo.h stacktraverse.h -t $out/include

2
pkgs/development/libraries/libf2c/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
unzip ${src}
'';
makeFlags = "-f makefile.u";
makeFlags = [ "-f" "makefile.u" ];
installPhase = ''
mkdir -p $out/include $out/lib

2
pkgs/development/libraries/libowfat/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
'';
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {

2
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF";
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;

2
pkgs/development/libraries/lmdb/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
patches = [ ./hardcoded-compiler.patch ];
patchFlags = "-p3";
patchFlags = [ "-p3" ];
outputs = [ "bin" "out" "dev" ];

2
pkgs/development/libraries/ois/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
})
];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
buildInputs = [
autoconf automake libtool libX11 xorgproto libXi libXaw

2
pkgs/development/libraries/readline/6.2.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ncurses];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
patches =
[ ./link-against-ncurses.patch
./no-arch_only.patch

2
pkgs/development/libraries/readline/8.0.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ncurses];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
upstreamPatches =
(let

2
pkgs/development/libraries/science/biology/mirtk/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
cmakeFlags = [ "-DWITH_VTK=ON" "-DBUILD_ALL_MODULES=ON" ];
doCheck = true;

41
pkgs/development/libraries/science/math/fenics/default.nix
View File

@ -142,26 +142,27 @@ stdenv.mkDerivation {
numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib
] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ];
patches = [ ./unicode.patch ];
cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11"
+ " -DDOLFIN_AUTO_DETECT_MPI=OFF"
+ " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_PARMETIS=OFF"
+ " -DDOLFIN_ENABLE_PETSC4PY=OFF"
+ " -DDOLFIN_ENABLE_PETSC=OFF"
+ " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_SCOTCH=OFF"
+ " -DDOLFIN_ENABLE_SLEPC4PY=OFF"
+ " -DDOLFIN_ENABLE_SLEPC=OFF"
+ " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_TRILINOS=OFF"
+ " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")
+ " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF");
cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11"
"-DDOLFIN_AUTO_DETECT_MPI=OFF"
("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF"))
("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF"))
"-DDOLFIN_ENABLE_PARMETIS=OFF"
"-DDOLFIN_ENABLE_PETSC4PY=OFF"
"-DDOLFIN_ENABLE_PETSC=OFF"
("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF"))
"-DDOLFIN_ENABLE_SCOTCH=OFF"
"-DDOLFIN_ENABLE_SLEPC4PY=OFF"
"-DDOLFIN_ENABLE_SLEPC=OFF"
("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF"))
"-DDOLFIN_ENABLE_TRILINOS=OFF"
("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF"))
("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"))
];
checkPhase = ''
make runtests
'';

2
pkgs/development/libraries/t1lib/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit patches;
buildInputs = [ libX11 libXaw ];
buildFlags = "without_doc";
buildFlags = [ "without_doc" ];
postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??

5
pkgs/development/lua-modules/overrides.nix
View File

@ -42,7 +42,8 @@ with super;
];
# https://github.com/wahern/cqueues/issues/227
NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null;
NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin
"-DCLOCK_MONOTONIC -DCLOCK_REALTIME";
disabled = luaOlder "5.1" || luaAtLeast "5.4";
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
@ -253,7 +254,7 @@ with super;
# Upstreams:
# 5.1: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz
# 5.2: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz
patchFlags = "-p2";
patchFlags = [ "-p2" ];
patches = [
./luuid.patch
];

2
pkgs/development/misc/amdapp-sdk/default.nix
View File

@ -46,7 +46,7 @@ in stdenv.mkDerivation {
patches = stdenv.lib.attrByPath [version "patches"] [] src_info;
patchFlags = "-p0";
patchFlags = [ "-p0" ];
buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
propagatedBuildInputs = [ stdenv.cc ];
NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";

2
pkgs/development/misc/qmk_firmware/default.nix
View File

@ -20,7 +20,7 @@ in stdenv.mkDerivation {
--replace arm-none-eabi arm-none-eabihf
rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk
'';
buildFlags = "all:default";
buildFlags = [ "all:default" ];
doCheck = true;
checkTarget = "test:all";
installPhase = ''

2
pkgs/development/ocaml-modules/biniou/1.0.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
preBuild = ''
mkdir $out/bin

2
pkgs/development/ocaml-modules/bolt/default.nix
View File

@ -45,7 +45,7 @@ EOF
createFindlibDestdir = true;
buildFlags = "all";
buildFlags = [ "all" ];
doCheck = true;
checkTarget = "tests";

6
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -8,14 +8,14 @@ let
url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz";
sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g";
patches = [];
installTargets = "install-findlib";
installTargets = [ "install-findlib" ];
} else {
version = "1.05";
download_id = "1037";
url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz";
sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
patches = [./makefile_1_05.patch];
installTargets = "install";
installTargets = [ "install" ];
};
in
@ -42,7 +42,7 @@ stdenv.mkDerivation {
--subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
'';
buildFlags = "all allopt";
buildFlags = [ "all" "allopt" ];
inherit (param) installTargets;

2
pkgs/development/ocaml-modules/cohttp/0.19.3.nix
View File

@ -19,7 +19,7 @@ buildOcaml rec {
++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];
buildFlags = "PREFIX=$(out)";
buildFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cohttp;

2
pkgs/development/ocaml-modules/cryptokit/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild ncurses ];
propagatedBuildInputs = [ param.zarith zlib ];
buildFlags = "setup.data build";
buildFlags = [ "setup.data" "build" ];
preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";

2
pkgs/development/ocaml-modules/dolmen/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ menhir ];
makeFlags = "-C src";
makeFlags = [ "-C" "src" ];
createFindlibDestdir = true;

2
pkgs/development/ocaml-modules/dypgen/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
make
'';
makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib";
makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
meta = {
homepage = http://dypgen.free.fr;

2
pkgs/development/ocaml-modules/frontc/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
})
];
makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)";
makeFlags = [ "PREFIX=$(out)" "OCAML_SITE=$(OCAMLFIND_DESTDIR)" ];
postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META";
}

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