summary refs log tree commit diff
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2018-10-27 05:11:57 -0700
committerRenaud <c0bw3b@users.noreply.github.com>2018-10-27 14:11:57 +0200
commit9f0381d4970acd24c22a6fac8d21b4d61345d38c (patch)
treec63ee0b2496451ed6257a740a7e837cab2719cc5
parent5e9d66e125db7fc29aa0282f1ee2c5e41371d2cc (diff)
downloadnixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar.gz
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar.bz2
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar.lz
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar.xz
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.tar.zst
nixlib-9f0381d4970acd24c22a6fac8d21b4d61345d38c.zip
sfml: 2.5.0 -> 2.5.1 (#48907)
* sfml: 2.5.0 -> 2.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sfml/versions

* sfml: cmake is only needed at build time

Moved cmake from buildInputs to nativeBuildInputs

* sfml: use fetchzip instead of fetchurl

Don't use fetchurl for changing GitHub archive tarballs
-rw-r--r--pkgs/development/libraries/sfml/default.nix15
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 03a801a32405..37ef0ce75271 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
 , IOKit, Foundation, AppKit, OpenAL
 }:
 
 let
-  version = "2.5.0";
+  version = "2.5.1";
 in
 
 stdenv.mkDerivation rec {
   name = "sfml-${version}";
-  src = fetchurl {
+
+  src = fetchzip {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
-    sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
+    sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
   };
-  buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
                   libXrandr libXrender xcbutilimage
                 ] ++ stdenv.lib.optional stdenv.isLinux udev
                   ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
                  "-DSFML_BUILD_FRAMEWORKS=no"
                  "-DSFML_USE_SYSTEM_DEPS=yes" ];
+
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
     description = "Simple and fast multimedia library";