maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 64-bit compatibility fixes (for problems revealed by building on an Athlon

Browse source 
64 running 64-bit SUSE).  A patched ATerm library is required to run Nix
  succesfully.
This commit is contained in:
Eelco Dolstra 2006-05-11 02:19:43 +00:00
parent e3c07782d1
commit 9d72bf8835
10 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix-env/main.cc
View file

@ -350,7 +350,7 @@ static void queryInstSources(EvalState & state,
DrvInfo elem;
elem.attrs = shared_ptr<ATermMap>(new ATermMap(0)); /* ugh... */
string name = baseNameOf(*i);
unsigned int dash = name.find('-');
string::size_type dash = name.find('-');
if (dash != string::npos)
name = string(name, dash + 1);

2
src/nix-env/profiles.cc
View file

@ -19,7 +19,7 @@ static int parseName(const string & profileName, const string & name)
{
if (string(name, 0, profileName.size() + 1) != profileName + "-") return -1;
string s = string(name, profileName.size() + 1);
unsigned int p = s.find("-link");
string::size_type p = s.find("-link");
if (p == string::npos) return -1;
int n;
if (string2Int(string(s, 0, p), n) && n >= 0)