diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-03 22:28:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-03 22:28:06 +0200 |
commit | 28def75a1094de45d6a3413d1c631a2b76a9bf8d (patch) | |
tree | 6fe03d742e0405e5645d7ea94407846317fa523a /pkgs/applications | |
parent | ca850897c87b45038981a740690c3ada6b4e7986 (diff) | |
parent | 507dfccdf811f391b6195081007b0d10cf9e9d7d (diff) | |
download | nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar.gz nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar.bz2 nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar.lz nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar.xz nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.tar.zst nixlib-28def75a1094de45d6a3413d1c631a2b76a9bf8d.zip |
Merge pull request #45967 from worldofpeace/various-build-fixes/18.09
Various build fixes
Diffstat (limited to 'pkgs/applications')
4 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index 1bf1a8b2c49e..fbe90c5377df 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }: let - version = "1.0.0-git5-20180115"; + version = "1.1.1-git1-20180828"; in stdenv.mkDerivation { name = "sayonara-player-${version}"; src = fetchurl { url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz"; - sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37"; + sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation { { description = "Sayonara music player"; homepage = https://sayonara-player.com/; license = licenses.gpl3; - platforms = qt5.qtbase.meta.platforms; + platforms = platforms.linux; maintainers = [ maintainers.deepfire ]; }; } diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index ad2cb4198d2d..a98029dd5807 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "imgcat-${version}"; version = "2.3.0"; - buildTools = [ autoconf automake libtool ncurses ]; + buildInputs = [ autoconf automake libtool ncurses ]; preConfigure = '' ${autoconf}/bin/autoconf diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index ffef558e84dd..6f3bf69889c5 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: stdenv.mkDerivation { - name = "photoflow-unstable-2018-03-06"; + name = "photoflow-unstable-2018-08-28"; src = fetchFromGitHub { owner = "aferrero2707"; repo = "PhotoFlow"; - rev = "f9bbea183fa02412d1d17075955d2284eeaf8174"; - sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf"; + rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38"; + sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9"; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ stdenv.mkDerivation { homepage = https://aferrero2707.github.io/PhotoFlow/; license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; - platforms = platforms.all; + platforms = platforms.linux; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 9ec9a3451bef..163f0ba3f497 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { name = "SkypeExport-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ boost166 ]; preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; |