* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
This commit is contained in:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
ensureDir $out/etc $out/var/lib
|
||||
mkdir -p $out/etc $out/var/lib
|
||||
makeFlags="$makeFlags prefix=$out"
|
||||
'';
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall =
|
||||
''
|
||||
ensureDir $out/lib
|
||||
mkdir -p $out/lib
|
||||
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
|
||||
'';
|
||||
|
||||
|
||||
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase =
|
||||
'' ensureDir "$out/bin"
|
||||
'' mkdir -p "$out/bin"
|
||||
cp -v httpfs2 "$out/bin"
|
||||
|
||||
ensureDir "$out/share/man/man1"
|
||||
mkdir -p "$out/share/man/man1"
|
||||
cp -v *.1 "$out/share/man/man1"
|
||||
'';
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ pkgconfig glib fuse ];
|
||||
postInstall = ''
|
||||
ensureDir $out/sbin
|
||||
mkdir -p $out/sbin
|
||||
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user