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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-31 12:00:36 +01:00
parent ec1f78d1cb 42575040fc
commit 070290bda7
172 changed files with 2734 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/virtualization/looking-glass-client/default.nix
View File

@@ -1,24 +1,24 @@
{ stdenv, fetchFromGitHub
, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
, libX11, freefont_ttf, nettle, libconfig
}:
stdenv.mkDerivation rec {
name = "looking-glass-client-${version}";
version = "a11";
version = "a12";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "0q4isn86pl5wddf6h8qd62fw3577ns2sd2myzw969sbl796bwcil";
sha256 = "0r6bvl9q94039r6ff4f2bg8si95axx9w8bf1h1qr5730d2kv5yxq";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
libX11 freefont_ttf nettle libconfig
libX11 freefont_ttf nettle libconfig cmake
];
enableParallelBuilding = true;
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
sourceRoot = "source/client";
installPhase = ''
mkdir -p $out
mv bin $out/
mkdir -p $out/bin
mv looking-glass-client $out/bin
'';
meta = with stdenv.lib; {

6
pkgs/applications/virtualization/virt-manager/qt.nix
View File

@@ -1,17 +1,18 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg, qttools, krdc
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
, libselinux, libsepol, utillinux
}:
mkDerivation rec {
name = "virt-manager-qt-${version}";
version = "0.60.88";
version = "0.70.91";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = "${version}";
sha256 = "0hd5d8zdghc5clv8pa4h9zigshdrarfpmzyvrq56rjkm13lrdz52";
sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43";
};
cmakeFlags = [
@@ -22,6 +23,7 @@ mkDerivation rec {
buildInputs = [
qtbase qtmultimedia qtsvg krdc
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
libselinux libsepol utillinux
];
nativeBuildInputs = [ cmake pkgconfig qttools ];