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

whitespace cleaning

Browse Source
This commit is contained in:
Mathijs Kwik 2013-06-25 09:17:34 +02:00
parent 0689016e3e
commit 7f413e4d5c
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/gimp/default.nix
View File

@ -5,12 +5,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gimp-2.6.12"; name = "gimp-2.6.12";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2"; url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym"; sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
}; };
buildInputs = [ buildInputs = [
pkgconfig gtk freetype fontconfig pkgconfig gtk freetype fontconfig
libart_lgpl libtiff libjpeg libpng12 libexif zlib perl libart_lgpl libtiff libjpeg libpng12 libexif zlib perl

6
pkgs/development/libraries/ffmpeg/1.x.nix
View File

@ -30,12 +30,12 @@ assert playSupport -> SDL != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-1.2"; name = "ffmpeg-1.2";
src = fetchurl { src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs";
}; };
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed # the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications. # applications.
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional playSupport SDL; ++ stdenv.lib.optional playSupport SDL;
enableParallelBuilding = true; enableParallelBuilding = true;
crossAttrs = { crossAttrs = {
dontSetConfigureCross = true; dontSetConfigureCross = true;
configureFlags = configureFlags ++ [ configureFlags = configureFlags ++ [

4
pkgs/development/libraries/gegl/0_0_22.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg { stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg
, librsvg, pango, gtk }: , librsvg, pango, gtk }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gegl-0.0.22"; name = "gegl-0.0.22";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ];
meta = { meta = {
description = "Graph-based image processing framework"; description = "Graph-based image processing framework";
homepage = http://www.gegl.org; homepage = http://www.gegl.org;
license = "GPL3"; license = "GPL3";

2
pkgs/development/libraries/leptonica/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "leptonica-1.68"; name = "leptonica-1.68";
src = fetchurl { src = fetchurl {
url = http://www.leptonica.org/source/leptonica-1.68.tar.gz; url = http://www.leptonica.org/source/leptonica-1.68.tar.gz;
sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc";

4
pkgs/development/libraries/qt-3/default.nix
View File

@ -59,10 +59,10 @@ stdenv.mkDerivation {
patches = [ patches = [
# Don't strip everything so we can get useful backtraces. # Don't strip everything so we can get useful backtraces.
./strip.patch ./strip.patch
# Build on NixOS. # Build on NixOS.
./qt-pwd.patch ./qt-pwd.patch
# randr.h and Xrandr.h need not be in the same prefix. # randr.h and Xrandr.h need not be in the same prefix.
./xrandr.patch ./xrandr.patch

2
pkgs/development/ocaml-modules/camlimages/default.nix
View File

@ -9,7 +9,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz"; url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz";
sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
}; };

10
pkgs/games/minetest/default.nix
View File

@ -15,23 +15,23 @@ let
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "minetest-${version}"; name = "minetest-${version}";
src = sources.src; src = sources.src;
cmakeFlags = [ cmakeFlags = [
"-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
]; ];
buildInputs = [ buildInputs = [
cmake irrlicht3843 libpng12 bzip2 libjpeg cmake irrlicht3843 libpng12 bzip2 libjpeg
libXxf86vm mesa openal libvorbis x11 libXxf86vm mesa openal libvorbis x11
]; ];
postInstall = '' postInstall = ''
mkdir -pv $out/share/minetest/games/minetest_game/ mkdir -pv $out/share/minetest/games/minetest_game/
cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
''; '';
meta = { meta = {
homepage = "http://minetest.net/"; homepage = "http://minetest.net/";
description = "Minetest is an infinite-world block sandbox game."; description = "Minetest is an infinite-world block sandbox game.";

2
pkgs/top-level/all-packages.nix
View File

@ -4042,7 +4042,7 @@ let
glpk = callPackage ../development/libraries/glpk { }; glpk = callPackage ../development/libraries/glpk { };
glsurf = callPackage ../applications/science/math/glsurf { glsurf = callPackage ../applications/science/math/glsurf {
inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
}; };