utillinux: rename to util-linux
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, utillinux
|
||||
{ stdenv, fetchurl, util-linux
|
||||
, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
|
||||
, vorbis-tools, xorriso }:
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ utillinux ];
|
||||
nativeBuildInputs = [ util-linux ];
|
||||
|
||||
postPatch = ''
|
||||
for path in \
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
BB_OGGENC=${vorbis-tools}/bin/oggenc \
|
||||
BB_OGGDEC=${vorbis-tools}/bin/oggdec \
|
||||
BB_FLACCMD=${flac.bin}/bin/flac \
|
||||
BB_EJECT=${utillinux}/bin/eject \
|
||||
BB_EJECT=${util-linux}/bin/eject \
|
||||
BB_NORMCMD=${normalize}/bin/normalize \
|
||||
; do
|
||||
echo $path
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, qt4, utillinux, coreutils, which, qmake4Hook
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, qt4, util-linux, coreutils, which, qmake4Hook
|
||||
, p7zip, mtools, syslinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace unetbootin.cpp \
|
||||
--replace /bin/df ${coreutils}/bin/df \
|
||||
--replace /sbin/blkid ${utillinux}/sbin/blkid \
|
||||
--replace /sbin/fdisk ${utillinux}/sbin/fdisk \
|
||||
--replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
|
||||
--replace /sbin/blkid ${util-linux}/sbin/blkid \
|
||||
--replace /sbin/fdisk ${util-linux}/sbin/fdisk \
|
||||
--replace /sbin/sfdisk ${util-linux}/sbin/sfdisk \
|
||||
--replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
|
||||
--replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
|
||||
--replace /usr/share/syslinux ${syslinux}/share/syslinux
|
||||
|
||||
Reference in New Issue
Block a user