Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e9d66e125db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f0381d4970a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 27, 2018

  1. 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
    @r-ryantm @c0bw3b
    r-ryantm authored and c0bw3b committed Oct 27, 2018
    Copy the full SHA
    9f0381d View commit details
Showing with 10 additions and 5 deletions.
  1. +10 −5 pkgs/development/libraries/sfml/default.nix
15 changes: 10 additions & 5 deletions pkgs/development/libraries/sfml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";