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

Updated from trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
This commit is contained in:
Lluís Batlle i Rossell
2010-08-20 13:41:12 +00:00
parent f7d0fcdaac 7dea1a0f4f
commit f16353b6f2
142 changed files with 2022 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/desktop-file-utils/default.nix
+12 -5
View File
@@ -1,10 +1,17 @@
{stdenv, fetchurl, pkgconfig, glib}:
{ stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec {
name = "desktop-file-utils-0.16";
stdenv.mkDerivation {
name = "desktop-file-utils-0.15";
src = fetchurl {
url = http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz;
md5 = "2fe8ebe222fc33cd4a959415495b7eed";
url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.bz2";
sha256 = "18y9am8n43rrnnldd1cy09ls39xz1gx3qczax2c4cjxayx5vwq3r";
};
buildInputs = [ pkgconfig glib ];
meta = {
homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
description = "Command line utilities for working with .desktop files";
};
}
pkgs/tools/misc/parallel/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20100620";
name = "parallel-20100722";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "1hzdzvkm5cqciy6lhcbdzi4aar09fgsf0lfb4a89mnlq4xdmr8jj";
sha256 = "1dq2icd6xigi4pf66178pdim6dmpw7vkfndwady5r93kymz7m399";
};
patchPhase =
pkgs/tools/misc/partition-manager/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt, kde, perl }:
{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kde, perl }:
stdenv.mkDerivation {
name = "partitionmanager-1.0.0";
@@ -9,16 +9,16 @@ stdenv.mkDerivation {
};
buildInputs =
[ cmake gettext parted libuuid qt kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
[ cmake gettext parted libuuid qt4 kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
preConfigure = ''
export VERBOSE=1
cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt}/include/QtGui )
cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt4}/include/QtGui )
'';
postInstall = ''
set -x
rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt}/lib
rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt4}/lib
for p in $out/bin/partitionmanager-bin; do
patchelf --set-rpath $rpath $p
done
pkgs/tools/misc/ttmkfdir/cstring.patch
-12
View File
@@ -1,15 +1,3 @@
diff --git a/directory.cpp b/directory.cpp
index 5f0d78a..b94cbe5 100644
--- a/directory.cpp
+++ b/directory.cpp
@@ -2,6 +2,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <cstring>
#include "directory.h"
diff --git a/Makefile b/Makefile
index e65b64c..52af5ed 100644
--- a/Makefile
pkgs/tools/misc/ttmkfdir/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
stdenv.mkDerivation {
name = "ttf-mkfontdir-3.0.9-5.1";
name = "ttf-mkfontdir-3.0.9-6";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz;
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
# who knows more about C/C++ ..
patches =
[ (fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-5.1.diff.gz;
sha256 = "1500kwvhxfq85zg7nwnn9dlvjxyg2ni7as17gdfm67pl9a45q3w4";
url = http://ftp.de.debian.org/debian/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz;
sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633";
})
./cstring.patch # also fixes some other compilation issues (freetype includes)