mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

fix evals /cc @ttuegel

Browse source
This commit is contained in:
Domen Kožar 2015-05-10 13:44:50 +02:00
parent 4f2b49744d
commit b7f15c43da
11 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/musescore/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
];
patchPhase = ''

2
pkgs/applications/audio/sonic-visualiser/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ libsndfile qt5 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
[ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
serd
sord

6
pkgs/applications/display-managers/lightdm/default.nix
View file

@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
qt4 qt5
];
qt4
] ++ stdenv.lib.optional (qt5 != null) qt5.base;
configureFlags = [
"--enable-liblightdm-gobject"
"--localstatedir=/var"
"--sysconfdir=/etc"
] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt"
++ stdenv.lib.optional (qt5 != null) "--enable-liblightdm-qt5";
++ stdenv.lib.optional ((qt5.base or null) != null) "--enable-liblightdm-qt5";
installFlags = [
"sysconfdir=\${out}/etc"

2
pkgs/applications/misc/calibre/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw

3
pkgs/applications/networking/irc/quassel/default.nix
View file

@ -10,6 +10,9 @@
, phonon_qt5, libdbusmenu_qt5
, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }:
assert stdenv.isLinux;
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
assert withKDE -> kdelibs != null;

2
pkgs/applications/networking/linssid/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
};
buildInputs = [ qt5 pkgconfig boost ];
buildInputs = [ qt5.base pkgconfig boost ];
postPatch = ''
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro

2
pkgs/applications/networking/p2p/firestr/default.nix
View file

@ -4,7 +4,7 @@
stdenv.mkDerivation {
name = "firestr-0.8";
buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ];
buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ];
src = fetchFromGitHub {
owner = "mempko";

2
pkgs/applications/video/obs-studio/default.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
jansson
libv4l
libxkbcommon
qt5
qt5.base
x264
];

2
pkgs/applications/video/shotcut/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1504ds3ppqmpg84nb2gb74qndqysjwn3xw7n8xv19kd1pppnr10f";
};
buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ];
buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5.base ];
configurePhase = "qmake PREFIX=$out";

13
pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
View file

@ -1,16 +1,13 @@
{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon
, qt4 ? null, qt5 ? null, withQt5 ? false }:
{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}:
with stdenv.lib;
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
let
pname = "phonon-backend-vlc";
v = "0.8.1";
# Force same Qt version in phonon and VLC
vlc_ = vlc.override { inherit qt4 qt5 withQt5; };
phonon_ = phonon.override { inherit qt4 qt5 withQt5; };
vlc_ = vlc.override { inherit qt4; };
phonon_ = phonon.override { inherit qt4; };
in
stdenv.mkDerivation {
@ -23,9 +20,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
buildInputs = [ vlc_ phonon_ (if withQt5 then qt5 else qt4)];
cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
buildInputs = [ vlc_ phonon_ qt4 ];
meta = {
homepage = http://phonon.kde.org/;

2
pkgs/development/libraries/quazip/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
installFlags = "INSTALL_ROOT=$(out)";
buildInputs = [ zlib qt.base ];
buildInputs = [ zlib (qt.base or qt) ];
meta = {
description = "Provides access to ZIP archives from Qt programs";