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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-18 10:41:34 +01:00
parent 0a085d508a 3aa6b8ccc5
commit 0d0d7dcd06
422 changed files with 65253 additions and 65218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/drivers/xboxdrv/default.nix
+3 -5
View File
@@ -11,12 +11,10 @@ in stdenv.mkDerivation {
sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
};
patchPhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';
makeFlags = "PREFIX=$(out)";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons libX11 libusb1 boost glib dbus-glib];
buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ];
dontUseSconsInstall = true;
meta = with stdenv.lib; {
homepage = https://pingus.seul.org/~grumbel/xboxdrv/;
pkgs/misc/emulators/dosbox/unstable.nix
-41
View File
@@ -1,41 +0,0 @@
{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
let revision = "4025";
revisionDate = "2017-07-02";
revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a";
in stdenv.mkDerivation rec {
name = "dosbox-unstable-${revisionDate}";
src = fetchsvn {
url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
rev = revision;
sha256 = revisionSha;
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ];
desktopItem = makeDesktopItem {
name = "dosbox";
exec = "dosbox";
comment = "x86 emulator with internal DOS";
desktopName = "DOSBox (SVN)";
genericName = "DOS emulator";
categories = "Application;Emulator;";
};
postInstall = ''
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
meta = {
homepage = http://www.dosbox.com/;
description = "A DOS emulator";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ binarin ];
license = stdenv.lib.licenses.gpl2Plus;
};
}
pkgs/misc/emulators/fceux/default.nix
+5 -5
View File
@@ -8,23 +8,23 @@ stdenv.mkDerivation {
sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig scons ];
buildInputs = [
scons zlib SDL lua5_1
zlib SDL lua5_1
];
phases = "unpackPhase buildPhase";
sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false";
prefixKey = "--prefix=";
# sed allows scons to find libraries in nix.
# mkdir is a hack to make scons succeed. It still doesn't
# actually put the files in there due to a bug in the SConstruct file.
# OPENGL doesn't work because fceux dlopens the library.
buildPhase = ''
preBuild = ''
sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
export CC="gcc"
export CXX="g++"
mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install
'';
meta = {
pkgs/misc/emulators/wxmupen64plus/default.nix
+7 -6
View File
@@ -1,4 +1,5 @@
{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}:
{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined
, wafHook }:
stdenv.mkDerivation {
name = "wxmupen64plus-0.3";
@@ -7,23 +8,23 @@ stdenv.mkDerivation {
sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
};
nativeBuildInputs = [ wafHook ];
buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ];
configurePhase = ''
preConfigure = ''
tar xf ${mupen64plus.src}
APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
export LDFLAGS="-lwx_gtk2u_adv-2.9"
python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`")
'';
buildPhase = "python waf";
installPhase = "python waf install";
NIX_CFLAGS_COMPILE = "-fpermissive";
meta = {
description = "GUI for the Mupen64Plus 2.0 emulator";
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
broken = true;
};
}
pkgs/misc/gnash/default.nix
+2 -8
View File
@@ -15,9 +15,6 @@
# media
, enableFFmpeg ? true, ffmpeg_2 ? null
, enableGstreamer ? false, gst-plugins-base ? null
, gst-plugins-ugly ? null
, gst-ffmpeg ? null
# misc
, enableJemalloc ? true, jemalloc ? null
@@ -31,8 +28,7 @@ let
available = x: x != null;
sound =
if enableFFmpeg then "ffmpeg" else
if enableGstreamer then "gst" else "none";
if enableFFmpeg then "ffmpeg" else "none";
renderers = []
++ optional enableAGG "agg"
@@ -58,7 +54,6 @@ assert enableQt -> available qt4;
# media libraries
assert enableFFmpeg -> available ffmpeg_2 ;
assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
# misc
assert enableJemalloc -> available jemalloc;
@@ -96,8 +91,7 @@ stdenv.mkDerivation rec {
++ optional enableJemalloc jemalloc
++ optional enableHwAccel libGLU_combined
++ optionals enablePlugins [ xulrunner npapi_sdk ]
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]
++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ];
configureFlags = with stdenv.lib; [
"--with-boost-incl=${boost.dev}/include"
pkgs/misc/jackaudio/default.nix
+12 -23
View File
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt
, wafHook
# Darwin Dependencies
, aften, AudioToolbox, CoreAudio, CoreFoundation
@@ -35,13 +36,13 @@ stdenv.mkDerivation rec {
sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh";
};
nativeBuildInputs = [ pkgconfig python makeWrapper ];
nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];
buildInputs = [ libsamplerate libsndfile readline eigen celt
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
] ++ optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
# CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
patches = optionals stdenv.isDarwin [ ./darwin-cf.patch ];
prePatch = ''
substituteInPlace svnversion_regenerate.sh \
@@ -51,30 +52,18 @@ stdenv.mkDerivation rec {
# It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
# since frameworks are impure we also have to use the impure CoreFoundation here.
# FIXME: remove when CoreFoundation is updated to 10.11
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
preConfigure = optionalString stdenv.isDarwin ''
export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
'';
configurePhase = ''
runHook preConfigure
configureFlags = [
"--classic"
"--autostart=${if (optDbus != null) then "dbus" else "classic"}"
] ++ optional (optDbus != null) "--dbus"
++ optional (optLibffado != null) "--firewire"
++ optional (optAlsaLib != null) "--alsa";
python waf configure --prefix=$out \
${optionalString (optDbus != null) "--dbus"} \
--classic \
${optionalString (optLibffado != null) "--firewire"} \
${optionalString (optAlsaLib != null) "--alsa"} \
--autostart=${if (optDbus != null) then "dbus" else "classic"} \
runHook postConfigure
'';
buildPhase = ''
python waf build
'';
installPhase = ''
python waf install
'' + (if libOnly then ''
postInstall = (if libOnly then ''
rm -rf $out/{bin,share}
rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
'' else ''
pkgs/misc/themes/obsidian2/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "theme-obsidian2-${version}";
version = "2.7";
version = "2.8";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-obsidian-2";
rev = "v${version}";
sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs";
sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
pkgs/misc/themes/qtcurve/default.nix
+51
View File
@@ -0,0 +1,51 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
, karchive, kconfig, kconfigwidgets, kio, frameworkintegration
, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
, libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies
}:
let
version = "1.9";
in stdenv.mkDerivation {
name = "qtcurve-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
buildInputs = [
gtk2
qtbase qtsvg qtx11extras
karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n
kwindowsystem kdelibs4support frameworkintegration
libpthreadstubs
pcre
libXdmcp libX11 libXau
];
preConfigure = ''
for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
do
substituteInPlace $i \
--replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}"
done
substituteInPlace CMakeLists.txt \
--replace \$\{GTK2_PREFIX\} $out
substituteInPlace gtk2/style/CMakeLists.txt \
--replace \$\{GTK2_LIBDIR\} $out/lib
patchShebangs tools/gen-version.sh
'';
meta = with stdenv.lib; {
homepage = https://github.com/QtCurve/qtcurve;
description = "Widget styles for Qt5/Plasma 5 and gtk2";
platforms = platforms.linux;
license = licenses.lgpl21Plus;
maintainers = [ maintainers.gnidorah ];
};
}
pkgs/misc/tmux-plugins/default.nix
+9 -1
View File
@@ -1,4 +1,9 @@
{ fetchgit, stdenv, pkgs }:
{ fetchgit
, lib
, pkgs
, reattach-to-user-namespace
, stdenv
}:
let
rtpPath = "share/tmux-plugins";
@@ -187,6 +192,9 @@ in rec {
rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
};
postInstall = lib.optionalString pkgs.stdenv.isDarwin ''
sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
'';
};
sessionist = mkDerivation {
pkgs/misc/vim-plugins/overrides.nix
+2 -2
View File
@@ -12,7 +12,7 @@
# vim-go denpencies
, asmfmt, delve, errcheck, godef, golint
, gomodifytags, gotags, gotools, motion
, gomodifytags, gotags, gotools, go-motion
, gnused, reftools, gogetdoc, gometalinter
, impl, iferr, gocode, gocode-gomod, go-tools
}:
@@ -265,6 +265,7 @@ with generated;
asmfmt
delve
errcheck
go-motion
go-tools
gocode
gocode-gomod
@@ -277,7 +278,6 @@ with generated;
gotools
iferr
impl
motion
reftools
];
in {