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

simgear: fix via update

This commit is contained in:
Vladimír Čunát 2013-02-23 20:10:15 +01:00
parent 5e8747300e
commit 871c9ff726
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/simgear/default.nix
View File

@ -1,23 +1,23 @@
x@{builderDefsPackage x@{builderDefsPackage
, plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto
, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut
, openscenegraph, openal , openscenegraph, openal, expat, cmake
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
let let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[]; [];
buildInputs = map (n: builtins.getAttr n x) buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="SimGear"; baseName="simgear";
version="2.0.0"; version="2.10.0";
name="${baseName}-${version}"; name="${baseName}-${version}";
extension="tar.gz"; extension="tar.bz2";
url="ftp://ftp.goflyflightgear.com/simgear/Source/${name}.${extension}"; url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
hash="08fia5rjrlvw45i3v09fn90vhdhb54wjl6kn3d8vpspxmsw4fn55"; hash="0pb148hb35p1c5iz0kpiclmswjl9bax9xfm087ldpxsqg9a0sb2q";
}; };
in in
rec { rec {
@ -30,8 +30,8 @@ rec {
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"]; phaseNames = [ "doCmake" "doMakeInstall" ];
meta = { meta = {
description = "Simulation construction toolkit"; description = "Simulation construction toolkit";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;

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

@ -4848,7 +4848,7 @@ let
silgraphite = callPackage ../development/libraries/silgraphite {}; silgraphite = callPackage ../development/libraries/silgraphite {};
simgear = callPackage ../development/libraries/simgear {}; simgear = callPackage ../development/libraries/simgear { };
sfml_git = callPackage ../development/libraries/sfml { }; sfml_git = callPackage ../development/libraries/sfml { };