Author: urkud Date: Fri Jan 6 18:13:11 2012 New Revision: 31358 URL: https://nixos.org/websvn/nix/?rev=31358&sc=1
Log: Fix XaraLX, add debian-patches.sh Added: nixpkgs/trunk/maintainers/scripts/debian-patches.sh (contents, props changed) nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.nix nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.txt Deleted: nixpkgs/trunk/pkgs/applications/graphics/xara/gtk_cflags.patch Modified: nixpkgs/trunk/pkgs/applications/graphics/xara/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Added: nixpkgs/trunk/maintainers/scripts/debian-patches.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/maintainers/scripts/debian-patches.sh Fri Jan 6 18:13:11 2012 (r31358) @@ -0,0 +1,32 @@ +#!/bin/sh + +# Download patches from debian project +# Usage $0 debian-patches.txt debian-patches.nix +# An example input and output files can be found in applications/graphics/xara/ + +DEB_URL=http://patch-tracker.debian.org/patch/series/dl +declare -a deb_patches +mapfile -t deb_patches < $1 + +prefix="${DEB_URL}/${deb_patches[0]}" + +if [[ -n "$2" ]]; then + exec 1> $2 +fi + +cat <<EOF +# Generated by $(basename $0) from $(basename $1) +let + prefix = "${prefix}"; +in +[ +EOF +for ((i=1;i < ${#deb_patches[@]}; ++i)); do + url="${prefix}/${deb_patches[$i]}" + sha256=$(nix-prefetch-url $url) + echo " {" + echo " url = \"\${prefix}/${deb_patches[$i]}\";" + echo " sha256 = \"$sha256\";" + echo " }" +done +echo "]" Added: nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.nix Fri Jan 6 18:13:11 2012 (r31358) @@ -0,0 +1,30 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5";; +in +[ + { + url = "${prefix}/30_gtk_wxwidgets_symbol_clash"; + sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz"; + } + { + url = "${prefix}/40_algorithm_include"; + sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0"; + } + { + url = "${prefix}/50_update_imagemagick_version_parser"; + sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497"; + } + { + url = "${prefix}/remove-icon-suffix"; + sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22"; + } + { + url = "${prefix}/45_fix_gcc4"; + sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi"; + } + { + url = "${prefix}/55_fix_contstuctor_call"; + sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1"; + } +] Added: nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/graphics/xara/debian-patches.txt Fri Jan 6 18:13:11 2012 (r31358) @@ -0,0 +1,7 @@ +xaralx/0.7r1785-5 +30_gtk_wxwidgets_symbol_clash +40_algorithm_include +50_update_imagemagick_version_parser +remove-icon-suffix +45_fix_gcc4 +55_fix_contstuctor_call Modified: nixpkgs/trunk/pkgs/applications/graphics/xara/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/applications/graphics/xara/default.nix Fri Jan 6 18:13:00 2012 (r31357) +++ nixpkgs/trunk/pkgs/applications/graphics/xara/default.nix Fri Jan 6 18:13:11 2012 (r31358) @@ -1,35 +1,20 @@ -{stdenv, fetchurl, autoconf, automake, gettext, libtool, cvs, wxGTK, gtk, -pkgconfig, libxml2, zip, libpng, libjpeg, shebangfix, perl, freetype}: +{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig +, wxGTK, gtk, perl, zip}: stdenv.mkDerivation { - name = "xaralx-0.7r1766"; + name = "xaralx-0.7r1785"; + src = fetchurl { - url = http://downloads2.xara.com/opensource/XaraLX-0.7r1766.tar.bz2; - sha256 = "1rcl7hqvcai586jky7hvzxhnq8q0ka2rsmgiq5ijwclgr5d4ah7n"; + url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2; + sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; - buildInputs = [automake autoconf gettext libtool cvs wxGTK gtk pkgconfig libxml2 zip libpng libjpeg shebangfix perl]; + buildNativeInputs = [ automake pkgconfig gettext perl zip ]; + buildInputs = [ wxGTK gtk libxml2 freetype pango ]; - inherit freetype libpng libjpeg libxml2; - configureFlags = "--with-wx-config --disable-svnversion --disable-international"; + configureFlags = "--disable-svnversion"; - patches = [./gtk_cflags.patch]; + patches = map fetchurl (import ./debian-patches.nix); - # Why do I need to add library path for freetype ? - installPhase = " - make install - ensureDir \$out/lib - mv \$out/{bin,lib}/XaraLX -cat >> \$out/bin/XaraLX << EOF -#!/bin/sh -LD_LIBRARY_PATH=\$freetype/lib:\$libpng/lib:\$libjpeg/lib:\$libxml2/lib: -\$out/lib/XaraLX \"\\$@\" -EOF -chmod +x \$out/bin/XaraLX -"; - - patchPhase = " - find . -iname \"*.pl\" | xargs shebangfix; - unset patchPhase; patchPhase - "; + prePatch = "patchShebangs Scripts"; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 6 18:13:00 2012 (r31357) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jan 6 18:13:11 2012 (r31358) @@ -7631,9 +7631,7 @@ inherit gsl aalib zlib libpng intltool gettext perl; }; - xara = callPackage ../applications/graphics/xara { - wxGTK = wxGTK26; - }; + xara = callPackage ../applications/graphics/xara { }; xawtv = callPackage ../applications/video/xawtv { }; _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
