public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
This commit is contained in:
Shea Levy
2013-02-21 11:13:30 -05:00
parent aacca1902c 9cff61881d
commit acd4299e75
71 changed files with 783 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/physfs/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
name = "physfs-2.0.2";
name = "physfs-2.0.3";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.gz";
sha256 = "02dwy0vsn2dp31f15vxd3yxxr1rgy25ab7ncavyh73i290qnsadf";
url = "${meta.homepage}/downloads/${name}.tar.bz2";
sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
};
nativeBuildInputs = [ cmake ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://icculus.org/physfs/;
homepage = "http://icculus.org/physfs/";
description = "Library to provide abstract access to various archives";
license = "free";
};