diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-15 13:25:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-15 13:25:01 +0000 |
commit | a4c304ef84cbb775948265db9ab026b78277fa20 (patch) | |
tree | 5c8cc27b0e242f806a550e913bf237859548e725 /pkgs/tools | |
parent | f5a2b4f7a3bf8a7d43e4e875be7697723b5c115f (diff) | |
parent | 871717cd5ad48843a54e40aa95618b100a8d9ed7 (diff) | |
download | nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar.gz nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar.bz2 nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar.lz nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar.xz nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.tar.zst nixlib-a4c304ef84cbb775948265db9ab026b78277fa20.zip |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/panomatic/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/package-management/checkinstall/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/package-management/checkinstall/etc-dirs.patch | 25 |
4 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index dc4b3ce95bbc..c2e85564e66c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -6,8 +6,11 @@ stdenv.mkDerivation { src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; rev = 844; + sha256 = "8729e63bb5cc9fd500a68d5aed91fa4b973ebc068e3014b47390ba7b4d85968e"; }; + NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; + buildInputs = [ flex zlib perl libpng libjpeg libxml2 ]; configurePhase = "cp config.mk.in config.mk"; diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix new file mode 100644 index 000000000000..1a7c3317cf9f --- /dev/null +++ b/pkgs/tools/graphics/panomatic/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, boost, zlib}: + +stdenv.mkDerivation { + name = "panomatic-0.9.4"; + + src = fetchurl { + url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2; + sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn"; + }; + + buildInputs = [ boost zlib ]; + + meta = { + homepage = http://aorlinsk2.free.fr/panomatic/; + description = "Tool that automates the creation of control points in Hugin"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index fe8f20bb456a..818d4e836d88 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { # Implement the getxattr(), lgetxattr(), __open_2() and # __open64_2() functions. Needed for doing builds on Ubuntu 8.10. ./missing-functions.patch + + # Don't include directories in the Debian `conffiles' file. + ./etc-dirs.patch ]; buildInputs = [gettext]; diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/tools/package-management/checkinstall/etc-dirs.patch new file mode 100644 index 000000000000..a811e4afbb97 --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/etc-dirs.patch @@ -0,0 +1,25 @@ +diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall +*** checkinstall-orig/checkinstall 2009-03-27 17:07:26.000000000 +0100 +--- checkinstall/checkinstall 2009-04-14 16:34:08.000000000 +0200 +*************** +*** 2607,2615 **** + chmod 755 $BUILD_DIR/DEBIAN/postrm + fi + +! # Tag files in /etc to be conffiles + find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ +! grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles + + # The package will be saved here (ignores <epoch>: prefix): + DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb" +--- 2607,2616 ---- + chmod 755 $BUILD_DIR/DEBIAN/postrm + fi + +! # Tag non-directory files in /etc to be conffiles + find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ +! (while read fn; do test ! -d "$BUILD_DIR/$fn" && echo "$fn"; done) \ +! > $BUILD_DIR/DEBIAN/conffiles + + # The package will be saved here (ignores <epoch>: prefix): + DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb" |