diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-06-25 09:17:34 +0200 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-06-27 21:35:21 +0200 |
commit | 7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16 (patch) | |
tree | 2e9e697250f10147e1aeb83b4081a328641c018c /pkgs | |
parent | 0689016e3edf46cdf747740d0e8d0c457a33b0a4 (diff) | |
download | nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar.gz nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar.bz2 nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar.lz nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar.xz nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.tar.zst nixlib-7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16.zip |
whitespace cleaning
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/1.x.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/gegl/0_0_22.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/leptonica/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/camlimages/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/minetest/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index b59b2bb67503..f2a4ec90f978 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "gimp-2.6.12"; - + src = fetchurl { url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2"; sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym"; }; - + buildInputs = [ pkgconfig gtk freetype fontconfig libart_lgpl libtiff libjpeg libpng12 libexif zlib perl diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 119e785ea4f7..3798119acd28 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -30,12 +30,12 @@ assert playSupport -> SDL != null; stdenv.mkDerivation rec { name = "ffmpeg-1.2"; - + src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; }; - + # `--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 # applications. @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional playSupport SDL; enableParallelBuilding = true; - + crossAttrs = { dontSetConfigureCross = true; configureFlags = configureFlags ++ [ diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index 150ba1ac961a..4eeb6886d71a 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg , librsvg, pango, gtk }: - + stdenv.mkDerivation { name = "gegl-0.0.22"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; - meta = { + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = "GPL3"; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 232f2775c00f..177b2d1f2600 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "leptonica-1.68"; - + src = fetchurl { url = http://www.leptonica.org/source/leptonica-1.68.tar.gz; sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 91eec5fcd315..a24f444488d7 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -59,10 +59,10 @@ stdenv.mkDerivation { patches = [ # Don't strip everything so we can get useful backtraces. ./strip.patch - + # Build on NixOS. ./qt-pwd.patch - + # randr.h and Xrandr.h need not be in the same prefix. ./xrandr.patch diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 037ebdea6b61..29816d297b57 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { + src = fetchurl { url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz"; sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 3b06cd8694cd..0a9a40140ef0 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -15,23 +15,23 @@ let }; in stdenv.mkDerivation { name = "minetest-${version}"; - + src = sources.src; - + cmakeFlags = [ "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" ]; - + buildInputs = [ cmake irrlicht3843 libpng12 bzip2 libjpeg libXxf86vm mesa openal libvorbis x11 ]; - + postInstall = '' mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ ''; - + meta = { homepage = "http://minetest.net/"; description = "Minetest is an infinite-world block sandbox game."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b75fd707b346..22e43b0e4c92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4042,7 +4042,7 @@ let 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; }; |