diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-13 14:58:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-13 14:58:17 +0000 |
| commit | 842eda63f8c44620a64035c9862b00f39c6c56c8 (patch) | |
| tree | a9b0d5d9c10ecaac1b4aed066723a490d1e115b4 /pkgs | |
| parent | c1389c4f36dc7d71ac441114976c2267d76afdab (diff) | |
| download | nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar.gz nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar.bz2 nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar.lz nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar.xz nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.tar.zst nixlib-842eda63f8c44620a64035c9862b00f39c6c56c8.zip | |
* Nasty hacks to get dpkg to set the architecture correctly.
svn path=/nixpkgs/trunk/; revision=11100
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/package-management/dpkg/default.nix | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index bf0ec26ec573..bdac312667bc 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -121,7 +121,6 @@ rec { ftp://ftp.debian.org/debian/ ]; - # Ubuntu. ubuntu = [ http://nl.archive.ubuntu.com/ubuntu/ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index e7eeff0d0045..40f04d75bbbe 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -10,6 +10,19 @@ stdenv.mkDerivation { configureFlags = "--without-dselect"; # --with-admindir=/var/lib/dpkg + preConfigure = '' + # Can't use substitute pending resolution of NIXPKGS-89. + sed -s 's^/usr/bin/perl^${perl}/bin/perl^' -i scripts/dpkg-architecture.pl + + # Nice: dpkg has a circular dependency on itself. Its configure + # script calls scripts/dpkg-architecture, which calls "dpkg" in + # $PATH. It doesn't actually use its result, but fails if it + # isn't present. So make a dummy available. + touch $TMPDIR/dpkg + chmod +x $TMPDIR/dpkg + PATH=$TMPDIR:$PATH + ''; + buildInputs = [perl zlib bzip2]; meta = { |