diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 22:45:50 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 22:45:50 +0100 |
commit | a84844de037258229272c2e901df4f043f6e006b (patch) | |
tree | fdee8fc63f8a2cdf489a5eed874036fbdf7c15c6 /pkgs/applications/networking | |
parent | eea55393abb1c63285629ad9ff7e467515fd230c (diff) | |
parent | 0ac5af9f3aa5beaa94fdf84349afb23f33cc4405 (diff) | |
download | nixlib-a84844de037258229272c2e901df4f043f6e006b.tar nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.gz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.bz2 nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.lz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.xz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.zst nixlib-a84844de037258229272c2e901df4f043f6e006b.zip |
Merge branch 'master' into gcc-7
... to fix lispPackages.*
Diffstat (limited to 'pkgs/applications/networking')
4 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9356794bb5d6..90aec9831930 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -2,16 +2,17 @@ , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: stdenv.mkDerivation rec { - # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a - # release but it is basically 2.1.2 with the falkon name + # KDE hasn't made a release of falkon yet so we just track git for now which is + # based on the most recent release of qupzilla + # This wip version is 2.1.99 so we add the .1 name = "falkon-${version}.1"; - version = "2.1.2"; + version = "2.1.99"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; - rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; - sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + rev = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495"; + sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d"; }; preConfigure = '' @@ -21,8 +22,6 @@ stdenv.mkDerivation rec { export FALKON_PREFIX=$out ''; - dontUseCmakeConfigure = true; - buildInputs = [ libpthreadstubs libxcb libXdmcp kwallet @@ -31,8 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 010f60881b5b..12ea714fb234 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -71,7 +71,7 @@ let ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash - ++ lib.optional (config.pulseaudio or false) libpulseaudio; + ++ lib.optional (config.pulseaudio or true) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra_gtk2 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b1b1132f22b0..17c285d9bdf7 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,6 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, kerberos # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -57,6 +58,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at_spi2_atk + kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 652de194a5e7..3cbc03e8d73c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; - postInstall = stdenv.lib.optionalString (withGnomeKeyring) '' + postInstall = '' + sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ + $out/share/applications/nextcloud.desktop + '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} ''; |