diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/tools/package-management/disnix/default.nix | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/tools/package-management/disnix/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/disnix/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 10113d04a78..e9b9e722c87 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, dbus_glib, openssl, libxml2}: +{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable}: stdenv.mkDerivation { - name = "disnix"; - src = fetchsvn { - url = https://svn.nixos.org/repos/nix/disnix/disnix/trunk; - sha256 = "4397dc0bf4b4ecca795784d0011eb631538b17bd81e77b84bf15d89bf85e94bb"; - rev = 16924; + name = "disnix-0.1"; + src = fetchurl { + url = http://hydra.nixos.org/build/334661/download/1/disnix-0.1.tar.gz; + sha256 = "0qiskbgn49dihhicczsbjandwjnz04yhnlxgwjinkcyfzsh4yqdp"; }; - buildInputs = [ autoconf automake libtool pkgconfig dbus_glib openssl libxml2 ]; - preConfigure = "./bootstrap"; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]; } |