mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 02:33:25 +00:00
Merge staging into staging-next
This commit is contained in:
Frederik Rietdijk
commit
74e3c9bcaf
@ -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>
|
||||
|
||||
@ -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" ];
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
installFlags = "PREFIX=$(out)";
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
installFlags = ''
|
||||
DESTDIR=$(out)
|
||||
'';
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
fixupPhase = ''
|
||||
cp -r $out/var/empty/local/lib $out
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
libao json_c libgcrypt ffmpeg curl
|
||||
];
|
||||
|
||||
makeFlags="PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
CC = "gcc";
|
||||
CFLAGS = "-std=c99";
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
libXext
|
||||
libXi
|
||||
];
|
||||
buildFlags = "linux-alsa";
|
||||
buildFlags = [ "linux-alsa" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -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,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 ];
|
||||
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
cppzmq hidapi randomx
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
|
||||
|
||||
patches = [ ./move-log-file.patch ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
ncurses
|
||||
];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
buildFlags = [ "CFLAGS=-fgnu89-inline" ];
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
makeFlags = [
|
||||
"-C" "src"
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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" \
|
||||
|
||||
@ -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";
|
||||
|
||||
|
||||
@ -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" ];
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
./switch.patch
|
||||
];
|
||||
|
||||
patchFlags = "-p0";
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
preBuild = ''
|
||||
# Version 1.7 was released as 1.6
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
|
||||
modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs";
|
||||
|
||||
buildFlags = "-tags extended";
|
||||
buildFlags = [ "-tags" "extended" ];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql";
|
||||
};
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
libtool
|
||||
];
|
||||
|
||||
configureFlags = "--libexecdir=$(out)/bin";
|
||||
configureFlags = [ "--libexecdir=$(out)/bin" ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/notify-osd" \
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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'';
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -161,7 +161,10 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ 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'
|
||||
|
||||
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
|
||||
"sysconfdir=\${out}/etc"
|
||||
];
|
||||
|
||||
installTargets = "install install-conf";
|
||||
installTargets = [ "install" "install-conf" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/suricatasc" \
|
||||
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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/;
|
||||
|
||||
@ -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)";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze
|
||||
|
||||
@ -156,6 +156,8 @@ stdenv.mkDerivation rec {
|
||||
rm -rf obj-x86_64-pc-linux-gnu
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
preConfigure = ''
|
||||
# remove distributed configuration files
|
||||
rm -f configure
|
||||
|
||||
@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
|
||||
pname = "frostwire";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
|
||||
sha256 = "03vxg0qas4mz5ggrmi396nkz44x1kgq8bfbhbr9mnal9ay9qmi8m";
|
||||
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
|
||||
sha256 = "0pd9akfq8cx9qkfkzravvrb8pjaxa4b0vgjdwqc1zvkng4wl8848";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
description = "BitTorrent Client and Cloud File Downloader";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ gavin ];
|
||||
platforms = platforms.all;
|
||||
platforms = [ "x86_64-linux"];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, opal, ptlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
rev = "3090e9f";
|
||||
|
||||
name = "sipcmd-${rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "sipcmd";
|
||||
owner = "tmakkonen";
|
||||
inherit rev;
|
||||
sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c";
|
||||
};
|
||||
|
||||
buildInputs = [ opal ptlib ];
|
||||
|
||||
buildPhase = ''
|
||||
make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
cp sipcmd $out/bin/sipcmd
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/tmakkonen/sipcmd;
|
||||
description = "The command line SIP/H.323/RTP softphone";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "casync";
|
||||
version = "2-152-ge4a3c5e";
|
||||
version = "2-219-ga8f6c84";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "casync";
|
||||
rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9";
|
||||
sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0";
|
||||
rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8";
|
||||
sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws";
|
||||
};
|
||||
|
||||
buildInputs = [ acl curl xz zstd ]
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# Whether to build with contractor support (Pantheon specific)
|
||||
cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ];
|
||||
cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes";
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ imake gccmakedep ];
|
||||
buildInputs = [ libXt libXext ];
|
||||
|
||||
installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
|
||||
installTargets="install install.man";
|
||||
installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
|
||||
installTargets = [ "install" "install.man" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "sets the X root window to an image of the Earth";
|
||||
|
||||
@ -1,23 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, zlib }:
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megahit";
|
||||
version = "1.1.4";
|
||||
version = "1.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voutcn";
|
||||
repo = "megahit";
|
||||
rev = "v${version}";
|
||||
sha256 = "011k0776w76l03zmy70kfd3y9zjmdnspfbs9fcxmnl3bdwd36kcw";
|
||||
sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
installPhase = ''
|
||||
for bin in megahit_sdbg_build megahit megahit_asm_core megahit_toolkit; do
|
||||
install -vD $bin $out/bin/$bin
|
||||
done
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";
|
||||
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib python2 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
"-Wno-error=pessimizing-move"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py
|
||||
|
||||
@ -22,7 +22,7 @@ in rec {
|
||||
rev = "sumalib_v${version}";
|
||||
sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a";
|
||||
};
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
inherit meta;
|
||||
};
|
||||
|
||||
|
||||
@ -143,7 +143,7 @@ self = stdenv.mkDerivation {
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
buildFlags = "revision coq coqide bin/votour";
|
||||
buildFlags = [ "revision" "coq" "coqide" "bin/votour" ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff -aur minisat/core/SolverTypes.h minisat.clang/core/SolverTypes.h
|
||||
--- minisat/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200
|
||||
+++ minisat.clang/core/SolverTypes.h 2016-05-13 12:14:50.759671959 +0200
|
||||
@@ -47,7 +47,7 @@
|
||||
int x;
|
||||
|
||||
// Use this as a constructor:
|
||||
- friend Lit mkLit(Var var, bool sign = false);
|
||||
+ //friend Lit mkLit(Var var, bool sign = false);
|
||||
|
||||
bool operator == (Lit p) const { return x == p.x; }
|
||||
bool operator != (Lit p) const { return x != p.x; }
|
||||
@@ -55,7 +55,7 @@
|
||||
};
|
||||
|
||||
|
||||
-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
|
||||
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
|
||||
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
|
||||
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
|
||||
inline bool sign (Lit p) { return p.x & 1; }
|
||||
diff -aur minisat/utils/Options.h minisat.clang/utils/Options.h
|
||||
--- minisat/utils/Options.h 2010-07-10 18:07:36.000000000 +0200
|
||||
+++ minisat.clang/utils/Options.h 2016-05-13 12:14:50.759671959 +0200
|
||||
@@ -282,15 +282,15 @@
|
||||
if (range.begin == INT64_MIN)
|
||||
fprintf(stderr, "imin");
|
||||
else
|
||||
- fprintf(stderr, "%4"PRIi64, range.begin);
|
||||
+ fprintf(stderr, "%4" PRIi64, range.begin);
|
||||
|
||||
fprintf(stderr, " .. ");
|
||||
if (range.end == INT64_MAX)
|
||||
fprintf(stderr, "imax");
|
||||
else
|
||||
- fprintf(stderr, "%4"PRIi64, range.end);
|
||||
+ fprintf(stderr, "%4" PRIi64, range.end);
|
||||
|
||||
- fprintf(stderr, "] (default: %"PRIi64")\n", value);
|
||||
+ fprintf(stderr, "] (default: %" PRIi64 ")\n", value);
|
||||
if (verbose){
|
||||
fprintf(stderr, "\n %s\n", description);
|
||||
fprintf(stderr, "\n");
|
||||
Only in minisat.clang/utils: Options.o
|
||||
Only in minisat.clang/utils: System.o
|
||||
@ -1,26 +0,0 @@
|
||||
https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb
|
||||
|
||||
diff --git a/utils/System.cc b/utils/System.cc
|
||||
index a7cf53f..feeaf3c 100644
|
||||
--- a/utils/System.cc
|
||||
+++ b/utils/System.cc
|
||||
@@ -78,16 +78,17 @@ double Minisat::memUsed(void) {
|
||||
struct rusage ru;
|
||||
getrusage(RUSAGE_SELF, &ru);
|
||||
return (double)ru.ru_maxrss / 1024; }
|
||||
-double MiniSat::memUsedPeak(void) { return memUsed(); }
|
||||
+double Minisat::memUsedPeak(void) { return memUsed(); }
|
||||
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
#include <malloc/malloc.h>
|
||||
|
||||
-double Minisat::memUsed(void) {
|
||||
+double Minisat::memUsed() {
|
||||
malloc_statistics_t t;
|
||||
malloc_zone_statistics(NULL, &t);
|
||||
return (double)t.max_size_in_use / (1024*1024); }
|
||||
+double Minisat::memUsedPeak() { return memUsed(); }
|
||||
|
||||
#else
|
||||
double Minisat::memUsed() {
|
||||
@ -1,27 +1,19 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minisat";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://minisat.se/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stp";
|
||||
repo = pname;
|
||||
rev = "releases/${version}";
|
||||
sha256 = "14vcbjnlia00lpyv2fhbmw3wbc9bk9h7bln9zpyc3nwiz5cbjz4a";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ ./darwin.patch ]
|
||||
++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
preBuild = "cd simp";
|
||||
makeFlags = [ "r" "MROOT=.." ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp minisat_release $out/bin/minisat
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Compact and readable SAT solver";
|
||||
maintainers = with maintainers; [ gebner raskin ];
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, zlib, cmake }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "minisat-unstable-2013-09-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niklasso";
|
||||
repo = "minisat";
|
||||
rev = "37dc6c67e2af26379d88ce349eb9c4c6160e8543";
|
||||
sha256 = "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Compact and readable SAT solver";
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
homepage = http://minisat.se/;
|
||||
};
|
||||
}
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
buildFlags = "all";
|
||||
buildFlags = [ "all" ];
|
||||
|
||||
checkPhase = "make test1";
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }:
|
||||
{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl
|
||||
, python3, python3Packages, zlib, minisat, cryptominisat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stp";
|
||||
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87";
|
||||
};
|
||||
|
||||
buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ];
|
||||
buildInputs = [ boost zlib minisat cryptominisat python3 ];
|
||||
nativeBuildInputs = [ cmake bison flex perl ];
|
||||
preConfigure = ''
|
||||
python_install_dir=$out/${python3Packages.python.sitePackages}
|
||||
|
||||
@ -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/
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
|
||||
};
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://mrob.com/pub/ries/;
|
||||
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (!withXaw3d) "--with-local-xaw"
|
||||
;
|
||||
|
||||
makeFlags = "all";
|
||||
makeFlags = [ "all" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.scilab.org/;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
|
||||
{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
|
||||
freeimage, glog, libGLU, glew, qtbase,
|
||||
cudaSupport ? false, cudatoolkit ? null }:
|
||||
|
||||
assert !cudaSupport || cudatoolkit != null;
|
||||
|
||||
let boost_static = boost.override { enableStatic = true; };
|
||||
in
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.5";
|
||||
pname = "colmap";
|
||||
@ -15,7 +15,14 @@ mkDerivation rec {
|
||||
rev = version;
|
||||
sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch";
|
||||
sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_static ceres-solver eigen
|
||||
freeimage glog libGLU glew qtbase
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -54,28 +54,28 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# For more information see:
|
||||
# https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options)
|
||||
cmakeFlags= ''
|
||||
-Denable_documentation=${optionOnOff buildDocumentation}
|
||||
-Denable_java=${optionOnOff buildJavaBindings}
|
||||
-Denable_fortran=${optionOnOff fortranSupport}
|
||||
-Denable_model-checking=${optionOnOff modelCheckingSupport}
|
||||
-Denable_ns3=off
|
||||
-Denable_lua=off
|
||||
-Denable_lib_in_jar=off
|
||||
-Denable_maintainer_mode=off
|
||||
-Denable_mallocators=on
|
||||
-Denable_debug=on
|
||||
-Denable_smpi=on
|
||||
-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
|
||||
-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
|
||||
-Denable_compile_warnings=${optionOnOff debug}
|
||||
-Denable_compile_optimizations=${optionOnOff (!debug)}
|
||||
-Denable_lto=${optionOnOff (!debug)}
|
||||
'';
|
||||
# -Denable_lua=${optionOnOff luaSupport}
|
||||
# -Denable_smpi_papi=${optionOnOff moreTests}
|
||||
cmakeFlags = [
|
||||
"-Denable_documentation=${optionOnOff buildDocumentation}"
|
||||
"-Denable_java=${optionOnOff buildJavaBindings}"
|
||||
"-Denable_fortran=${optionOnOff fortranSupport}"
|
||||
"-Denable_model-checking=${optionOnOff modelCheckingSupport}"
|
||||
"-Denable_ns3=off"
|
||||
"-Denable_lua=off"
|
||||
"-Denable_lib_in_jar=off"
|
||||
"-Denable_maintainer_mode=off"
|
||||
"-Denable_mallocators=on"
|
||||
"-Denable_debug=on"
|
||||
"-Denable_smpi=on"
|
||||
"-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}"
|
||||
"-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}"
|
||||
"-Denable_compile_warnings=${optionOnOff debug}"
|
||||
"-Denable_compile_optimizations=${optionOnOff (!debug)}"
|
||||
"-Denable_lto=${optionOnOff (!debug)}"
|
||||
# "-Denable_lua=${optionOnOff luaSupport}"
|
||||
# "-Denable_smpi_papi=${optionOnOff moreTests}"
|
||||
];
|
||||
|
||||
makeFlags = optionalString debug "VERBOSE=1";
|
||||
makeFlags = optional debug "VERBOSE=1";
|
||||
|
||||
# Some Perl scripts are called to generate test during build which
|
||||
# is before the fixupPhase, so do this manualy here:
|
||||
|
||||
@ -2,19 +2,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfitter";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tgz";
|
||||
url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz";
|
||||
sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515";
|
||||
sha256 = "0kmgc67nw5flp92yw5x6l2vsnhwsfi5z2a20404anisdgdjs8zc6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./undefined_behavior.patch
|
||||
];
|
||||
|
||||
CXXFLAGS = "-Werror=return-type";
|
||||
# patch needs to updated due to version bump
|
||||
#CXXFLAGS = "-Werror=return-type";
|
||||
|
||||
preConfigure =
|
||||
# Fix F77LD to workaround for a following build error:
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
installFlags = "HOME=\${out} install-doc";
|
||||
installFlags = [ "HOME=\${out}" "install-doc" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/git-remote-hg \
|
||||
|
||||
@ -114,7 +114,7 @@ stdenv.mkDerivation {
|
||||
# WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
|
||||
# We need many of these files during the installCheckPhase.
|
||||
|
||||
installFlags = "NO_INSTALL_HARDLINKS=1";
|
||||
installFlags = [ "NO_INSTALL_HARDLINKS=1" ];
|
||||
|
||||
preInstall = (stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ python2 git ];
|
||||
|
||||
makeFlags = "prefix=$$out";
|
||||
makeFlags = [ "prefix=$$out" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/etc/bash_completion.d/"
|
||||
|
||||
@ -27,7 +27,7 @@ buildGoPackage rec {
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optional pamSupport pam;
|
||||
|
||||
buildFlags = "-tags";
|
||||
buildFlags = [ "-tags" ];
|
||||
|
||||
buildFlagsArray =
|
||||
( optional sqliteSupport "sqlite"
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "Multiple Repository management tool";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, pkgconfig, cmake, doxygen
|
||||
, libopenshot-audio, imagemagick, ffmpeg
|
||||
, swig, python3
|
||||
, unittest-cpp, cppzmq, czmqpp
|
||||
, unittest-cpp, cppzmq, zeromq
|
||||
, qtbase, qtmultimedia }:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ imagemagick ffmpeg swig python3 unittest-cpp
|
||||
cppzmq czmqpp qtbase qtmultimedia ];
|
||||
cppzmq zeromq qtbase qtmultimedia ];
|
||||
|
||||
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
|
||||
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -46,9 +46,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# igrone glib-2.62 deprecations
|
||||
# Drop in next stable release.
|
||||
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# igrone glib-2.62 deprecations
|
||||
# Drop in next stable release.
|
||||
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"
|
||||
|
||||
# fix build with gcc9
|
||||
"-Wno-error=address-of-packed-member"
|
||||
"-Wno-error=format-overflow"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
|
||||
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
|
||||
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
|
||||
systemd}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spice-vdagent-0.18.0";
|
||||
name = "spice-vdagent-0.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
|
||||
sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0";
|
||||
sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3";
|
||||
};
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
|
||||
postPatch = ''
|
||||
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
|
||||
'';
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ alsaLib spice-protocol glib
|
||||
buildInputs = [ alsaLib spice-protocol glib libdrm
|
||||
libpciaccess libxcb libXrandr libXinerama libXfixes
|
||||
dbus systemd ] ;
|
||||
meta = {
|
||||
|
||||
@ -23,6 +23,16 @@ let
|
||||
# guest-additions/default.nix as well.
|
||||
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
|
||||
version = "6.0.14";
|
||||
|
||||
iasl' = iasl.overrideAttrs (old: rec {
|
||||
inherit (old) pname;
|
||||
version = "20190108";
|
||||
src = fetchurl {
|
||||
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" ];
|
||||
});
|
||||
in stdenv.mkDerivation {
|
||||
pname = "virtualbox";
|
||||
inherit version;
|
||||
@ -41,7 +51,7 @@ in stdenv.mkDerivation {
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs =
|
||||
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
|
||||
[ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
|
||||
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
|
||||
libXmu libpng libopus python ]
|
||||
++ optional javaBindings jdk
|
||||
|
||||
@ -156,6 +156,10 @@ callPackage (import ./generic.nix (rec {
|
||||
"-Wno-error=stringop-truncation"
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=array-bounds"
|
||||
# Fix build with GCC 9
|
||||
"-Wno-error=address-of-packed-member"
|
||||
"-Wno-error=format-overflow"
|
||||
"-Wno-error=absolute-value"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -175,6 +175,10 @@ callPackage (import ./generic.nix (rec {
|
||||
"-Wno-error=stringop-truncation"
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=array-bounds"
|
||||
# Fix build with GCC9
|
||||
"-Wno-error=address-of-packed-member"
|
||||
"-Wno-error=format-overflow"
|
||||
"-Wno-error=absolute-value"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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}" ];
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ libX11 libXext libXmu ];
|
||||
|
||||
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
|
||||
installTargets = "install install.man";
|
||||
installTargets = [ "install" "install.man" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.fnurt.net/larswm;
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
subdir = if stdenv.isDarwin then "osx" else "linux";
|
||||
in "spectrwm-SPECTRWM_2_7_2/${subdir}";
|
||||
|
||||
makeFlags="PREFIX=$(out)";
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installPhase = "PREFIX=$out make install";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -35,7 +35,7 @@ let
|
||||
sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk";
|
||||
};
|
||||
|
||||
buildFlags = "full-ttf";
|
||||
buildFlags = [ "full-ttf" ];
|
||||
|
||||
preBuild = "patchShebangs scripts";
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user