diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 12:14:06 -0500 |
| commit | 5c09d977c794d9243ddac17f6c429b5432431f8f (patch) | |
| tree | 1acbd7e7f0c01546d955d47c6a8fddfec8e632b6 /pkgs/tools/graphics | |
| parent | 21d991b1fd78214023551a0dada17b129cbd5cd5 (diff) | |
| parent | 18d059a4ac001fbaa9c2abc750a2830a52e1dae5 (diff) | |
| download | nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.gz nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.bz2 nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.lz nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.xz nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.tar.zst nixpkgs-5c09d977c794d9243ddac17f6c429b5432431f8f.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/oxipng/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/graphics/pfstools/default.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 10b4dd4a031..0fdabfe3588 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.1.8"; + version = "2.2.0"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "18ld65vm58s6x918g6bhfkrg7lw2lca8daidv88ff14wm5khjvik"; + sha256 = "00ys1dy8r1g84j04w50qcjas0qnfw4vphazvbfasd9q2b1p5z69l"; }; - cargoSha256 = "034i8hgi0zgv085bimlja1hl3nd096rqpi167pw6rda5aj18c625"; + cargoSha256 = "125r3jmgwcq8qddm8hjpyzaam96kkifaxixksyaw2iqk9xq0nrpm"; + + # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust + cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; @@ -19,8 +22,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - - # Needs newer/unstable rust: error[E0658]: macro is_arm_feature_detected! is unstable - broken = stdenv.isAarch64; }; } diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 4c1ff502433..77edcd34578 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig , openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt4 +, fftw, gsl, libexif, perl, opencv, qt5 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick libGLU_combined freeglut fftwFloat - fftw gsl libexif perl opencv qt4 + fftw gsl libexif perl opencv qt5.qtbase ]; patches = [ ./threads.patch ./pfstools.patch ]; |