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

* GNU parted: e2fsprogs -> libuuid.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16694
This commit is contained in:
Eelco Dolstra 2009-08-11 22:23:30 +00:00
parent a63c9c8e71
commit 130b060d90
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/parted/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, devicemapper, e2fsprogs, gettext, readline }: { stdenv, fetchurl, devicemapper, libuuid, gettext, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "parted-1.9.0"; name = "parted-1.9.0";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk"; sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk";
}; };
buildInputs = [ devicemapper e2fsprogs gettext readline ]; buildInputs = [ devicemapper libuuid gettext readline ];
# XXX: For some reason our libreadline.so doesn't have libncurses as # XXX: For some reason our libreadline.so doesn't have libncurses as
# NEEDED and `configure' links with `-Wl,--as-needed' so when # NEEDED and `configure' links with `-Wl,--as-needed' so when

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

@ -1129,7 +1129,7 @@ let
}; };
parted = import ../tools/misc/parted { parted = import ../tools/misc/parted {
inherit fetchurl stdenv devicemapper e2fsprogs gettext readline; inherit fetchurl stdenv devicemapper libuuid gettext readline;
}; };
patch = gnupatch; patch = gnupatch;
@ -3980,11 +3980,12 @@ let
inherit fetchurl stdenv liboil pkgconfig; inherit fetchurl stdenv liboil pkgconfig;
}; };
SDL = import ../development/libraries/SDL { SDL = makeOverridable (import ../development/libraries/SDL) {
inherit fetchurl stdenv pkgconfig x11 mesa alsaLib pulseaudio; inherit fetchurl stdenv pkgconfig x11 mesa alsaLib pulseaudio;
inherit (xlibs) libXrandr; inherit (xlibs) libXrandr;
openglSupport = mesaSupported; openglSupport = mesaSupported;
alsaSupport = true; alsaSupport = true;
pulseaudioSupport = false; # better go through ALSA
}; };
SDL_image = import ../development/libraries/SDL_image { SDL_image = import ../development/libraries/SDL_image {