Merge branch 'x-updates' into vlada/gnome3-notg
This commit is contained in:
Vladimír Čunát
commit
90fcea2a25
|
|
@ -1,2 +1,4 @@
|
|||
*~
|
||||
,*
|
||||
.*.swp
|
||||
.*.swo
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter.</para>
|
|||
<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
|
||||
a generic package builder function for any Perl package that has a
|
||||
standard <varname>Makefile.PL</varname>. It’s implemented in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
|
||||
|
||||
<para>Perl packages from CPAN are defined in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/perl-packages.nix</filename></link>,
|
||||
rather than <filename>pkgs/all-packages.nix</filename>. Most Perl
|
||||
packages are so straight-forward to build that they are defined here
|
||||
directly, rather than having a separate function for each package
|
||||
|
|
@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec {
|
|||
which many Python packages do nowadays, can be built very simply using
|
||||
the <varname>buildPythonPackage</varname> function. This function is
|
||||
implemented
|
||||
in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
|
||||
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix"><filename>pkgs/development/python-modules/generic/default.nix</filename></link>
|
||||
and works similarly to <varname>buildPerlPackage</varname>. (See
|
||||
<xref linkend="ssec-language-perl"/> for details.)
|
||||
</para>
|
||||
|
|
@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec {
|
|||
<para>
|
||||
Python packages that use <varname>buildPythonPackage</varname> are
|
||||
defined
|
||||
in <link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
|
||||
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>.
|
||||
Most of them are simple. For example:
|
||||
|
||||
<programlisting>
|
||||
|
|
@ -196,17 +196,18 @@ twisted = buildPythonPackage {
|
|||
</section>
|
||||
|
||||
|
||||
<!--
|
||||
<section><title>Haskell</title>
|
||||
<section><title>Java</title>
|
||||
|
||||
<para>TODO</para>
|
||||
<para>Java packages should install JAR files in
|
||||
<filename>$out/lib/java</filename>.</para>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
<section><title>Java</title>
|
||||
<!--
|
||||
<section><title>Haskell</title>
|
||||
|
||||
<para>TODO; Java support needs lots of improvement</para>
|
||||
<para>TODO</para>
|
||||
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ interpretation:</para>
|
|||
<alice@example.org>" "Bob <bob@example.com>"]</literal>. If
|
||||
you are the maintainer of multiple packages, you may want to add
|
||||
yourself to <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix"><filename>pkgs/lib/maintainers.nix</filename></link>
|
||||
and write something like <literal>[stdenv.lib.maintainers.alice
|
||||
stdenv.lib.maintainers.bob]</literal>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -176,6 +176,12 @@ following:
|
|||
(“MIT”) License</link>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>perl5</varname></term>
|
||||
<listitem><para>The Perl 5 license (Artistic License, version 1
|
||||
and GPL, version 1 or later).</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>free</varname></term>
|
||||
<listitem><para>Catch-all for free software licenses not listed
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Linux kernel or X.org.</para>
|
|||
<title>Linux kernel</title>
|
||||
|
||||
<para>The Nix expressions to build the Linux kernel are in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
|
||||
|
||||
<para>The function that builds the kernel has an argument
|
||||
<varname>kernelPatches</varname> which should be a list of
|
||||
|
|
@ -49,7 +49,7 @@ modulesTree = [kernel]
|
|||
<orderedlist>
|
||||
|
||||
<listitem>
|
||||
<para>Copy (<command>svn cp</command>) the old Nix expression
|
||||
<para>Copy the old Nix expression
|
||||
(e.g. <filename>linux-2.6.21.nix</filename>) to the new one
|
||||
(e.g. <filename>linux-2.6.22.nix</filename>) and update it.</para>
|
||||
</listitem>
|
||||
|
|
@ -69,7 +69,7 @@ modulesTree = [kernel]
|
|||
<orderedlist>
|
||||
|
||||
<listitem>
|
||||
<para>Make an <command>svn copy</command> from the old
|
||||
<para>Make an copy from the old
|
||||
config (e.g. <filename>config-2.6.21-i686-smp</filename>) to
|
||||
the new one
|
||||
(e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<para>Checkout the Nixpkgs source tree:
|
||||
|
||||
<screen>
|
||||
$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
|
||||
$ git clone git://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs</screen>
|
||||
|
||||
</para>
|
||||
|
|
@ -29,7 +29,7 @@ $ cd nixpkgs</screen>
|
|||
organisation. Create a directory for your package, e.g.
|
||||
|
||||
<screen>
|
||||
$ svn mkdir pkgs/development/libraries/libfoo</screen>
|
||||
$ mkdir pkgs/development/libraries/libfoo</screen>
|
||||
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo</screen>
|
|||
|
||||
<screen>
|
||||
$ emacs pkgs/development/libraries/libfoo/default.nix
|
||||
$ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
||||
$ git add pkgs/development/libraries/libfoo/default.nix</screen>
|
||||
|
||||
</para>
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>GNU cpio: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
|
||||
The simplest possible package. The generic builder in
|
||||
<varname>stdenv</varname> does everything for you. It has
|
||||
no dependencies beyond <varname>stdenv</varname>.</para>
|
||||
|
|
@ -64,21 +64,21 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>GNU Hello: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
|
||||
Also trivial, but it specifies some <varname>meta</varname>
|
||||
attributes which is good practice.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>GNU Multiple Precision arithmetic library (GMP): <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix"><filename>pkgs/development/libraries/gmp/default.nix</filename></link>.
|
||||
Also done by the generic builder, but has a dependency on
|
||||
<varname>m4</varname>.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Pan, a GTK-based newsreader: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
|
||||
Has an optional dependency on <varname>gtkspell</varname>,
|
||||
which is only built if <varname>spellCheck</varname> is
|
||||
<literal>true</literal>.</para>
|
||||
|
|
@ -86,7 +86,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Apache HTTPD: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix"><filename>pkgs/servers/http/apache-httpd/default.nix</filename></link>.
|
||||
A bunch of optional features, variable substitutions in the
|
||||
configure flags, a post-install hook, and miscellaneous
|
||||
hackery.</para>
|
||||
|
|
@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>BitTorrent (wxPython-based): <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix"><filename>pkgs/tools/networking/p2p/bittorrent/default.nix</filename></link>.
|
||||
Uses an external <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build
|
||||
script</link>, which can be useful if you have lots of code
|
||||
that you don’t want cluttering up the Nix expression. But
|
||||
external builders are mostly obsolete.
|
||||
|
|
@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Thunderbird: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/3.x.nix</filename></link>.
|
||||
Lots of dependencies.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>JDiskReport, a Java utility: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
|
||||
(and the <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
|
||||
Nixpkgs doesn’t have a decent <varname>stdenv</varname> for
|
||||
Java yet so this is pretty ad-hoc.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>XML::Simple, a Perl module: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
|
||||
(search for the <varname>XMLSimple</varname> attribute).
|
||||
Most Perl modules are so simple to build that they are
|
||||
defined directly in <filename>perl-packages.nix</filename>;
|
||||
|
|
@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
|
||||
<listitem>
|
||||
<para>Adobe Reader: <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
|
||||
Shows how binary-only packages can be supported. In
|
||||
particular the <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
|
||||
uses <command>patchelf</command> to set the RUNPATH and ELF
|
||||
interpreter of the executables so that the right libraries
|
||||
are found at runtime.</para>
|
||||
|
|
@ -163,7 +163,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
<listitem>
|
||||
<para>A list of schemes for <literal>mirror://</literal>
|
||||
URLs can be found in <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
|
@ -173,7 +173,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
<para>The exact syntax and semantics of the Nix expression
|
||||
language, including the built-in function, are described in the
|
||||
Nix manual in the <link
|
||||
xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions">chapter
|
||||
xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
|
||||
on writing Nix expressions</link>.</para>
|
||||
|
||||
</listitem>
|
||||
|
|
@ -181,7 +181,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen>
|
|||
<listitem>
|
||||
<para>Add a call to the function defined in the previous step to
|
||||
<link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
|
||||
with some descriptive name for the variable,
|
||||
e.g. <varname>libfoo</varname>.
|
||||
|
||||
|
|
@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo</screen>
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Optionally commit the new package (<command>svn
|
||||
ci</command>) or send a patch to
|
||||
<para>Optionally commit the new package, or send a patch to
|
||||
<literal>nix-dev@cs.uu.nl</literal>.</para>
|
||||
</listitem>
|
||||
|
||||
|
|
@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo</screen>
|
|||
package and make them available in the <link
|
||||
xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal>
|
||||
channel</link>, add it to <link
|
||||
xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para>
|
||||
</listitem>
|
||||
|
||||
</orderedlist>
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@ base="$(basename "$url")"
|
|||
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
|
||||
dstPath="$distDir/$base"
|
||||
|
||||
if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
|
||||
if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
|
||||
|
||||
if [ -z "$file" ]; then
|
||||
|
||||
echo "downloading $url to $dstPath"
|
||||
|
||||
if [ -n "$dryRun" ]; then exit 0; fi
|
||||
if [ -n "$DRY_RUN" ]; then exit 0; fi
|
||||
|
||||
declare -a res
|
||||
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
|
||||
continue
|
||||
exit
|
||||
fi
|
||||
|
||||
storePath=${res[1]}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/
|
|||
|
||||
for url in $urls; do
|
||||
if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
|
||||
if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; continue; fi
|
||||
|
||||
# Check the URL scheme.
|
||||
if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
|
||||
|
||||
# Check the basename. It should include something resembling a version.
|
||||
base="$(basename "$url")"
|
||||
#if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
|
||||
if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
|
||||
if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
|
||||
if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
|
||||
if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
|
||||
if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
|
||||
|
||||
$(dirname $0)/copy-tarball.sh "$url"
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
with import ../../pkgs/lib;
|
||||
|
||||
let
|
||||
trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y);
|
||||
trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y);
|
||||
|
||||
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ let
|
|||
|
||||
strictAttrs = as: seqList (attrValues as) as;
|
||||
|
||||
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
|
||||
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {};
|
||||
|
||||
call = attrs: flip mapAttrs attrs
|
||||
(n: v: trace n (
|
||||
|
|
|
|||
|
|
@ -0,0 +1,122 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl
|
||||
|
||||
name="$1"
|
||||
[ -n "$name" ] || { echo "no name"; exit 1; }
|
||||
|
||||
cpan -D "$name" > cpan-info
|
||||
|
||||
url="$(echo $(cat cpan-info | sed '6!d'))"
|
||||
[ -n "$url" ] || { echo "no URL"; exit 1; }
|
||||
url="mirror://cpan/authors/id/$url"
|
||||
echo "URL = $url" >&2
|
||||
|
||||
version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }')
|
||||
echo "VERSION = $version"
|
||||
|
||||
declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url"))
|
||||
hash=${xs[0]}
|
||||
path=${xs[1]}
|
||||
echo "HASH = $hash" >&2
|
||||
|
||||
namedash="$(echo $name | sed s/::/-/g)-$version"
|
||||
|
||||
attr=$(echo $name | sed s/:://g)
|
||||
|
||||
rm -rf cpan_tmp
|
||||
mkdir cpan_tmp
|
||||
tar xf "$path" -C cpan_tmp
|
||||
|
||||
shopt -s nullglob
|
||||
meta=$(echo cpan_tmp/*/META.json)
|
||||
if [ -z "$meta" ]; then
|
||||
yaml=$(echo cpan_tmp/*/META.yml)
|
||||
[ -n "$yaml" ] || { echo "no meta file"; exit 1; }
|
||||
meta=$(echo $yaml | sed s/\.yml$/.json/)
|
||||
perl -e '
|
||||
use YAML;
|
||||
use JSON;
|
||||
local $/;
|
||||
$x = YAML::Load(<>);
|
||||
print encode_json $x;
|
||||
' < $yaml > $meta
|
||||
fi
|
||||
|
||||
description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')"
|
||||
homepage="$(json resources.homepage < $meta)"
|
||||
if [ -z "$homepage" ]; then
|
||||
#homepage="$(json meta-spec.url < $meta)"
|
||||
true
|
||||
fi
|
||||
|
||||
license="$(json license < $meta | json -a 2> /dev/null || true)"
|
||||
if [ -z "$license" ]; then
|
||||
license="$(json -a license < $meta)"
|
||||
fi
|
||||
license="$(echo $license | sed s/perl_5/perl5/)"
|
||||
|
||||
f() {
|
||||
local type="$1"
|
||||
perl -e '
|
||||
use JSON;
|
||||
local $/;
|
||||
$x = decode_json <>;
|
||||
if (defined $x->{prereqs}) {
|
||||
$x2 = $x->{prereqs}->{'$type'}->{requires};
|
||||
} elsif ("'$type'" eq "runtime") {
|
||||
$x2 = $x->{requires};
|
||||
} elsif ("'$type'" eq "configure") {
|
||||
$x2 = $x->{configure_requires};
|
||||
} elsif ("'$type'" eq "build") {
|
||||
$x2 = $x->{build_requires};
|
||||
}
|
||||
foreach my $y (keys %{$x2}) {
|
||||
next if $y eq "perl";
|
||||
eval "use $y;";
|
||||
if (!$@) {
|
||||
print STDERR "skipping Perl-builtin module $y\n";
|
||||
next;
|
||||
}
|
||||
print $y, "\n";
|
||||
};
|
||||
' < $meta | sed s/:://g
|
||||
}
|
||||
|
||||
confdeps=$(f configure)
|
||||
builddeps=$(f build)
|
||||
testdeps=$(f test)
|
||||
runtimedeps=$(f runtime)
|
||||
|
||||
buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq))
|
||||
propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq))
|
||||
|
||||
echo "===" >&2
|
||||
|
||||
cat <<EOF
|
||||
$attr = buildPerlPackage {
|
||||
name = "$namedash";
|
||||
src = fetchurl {
|
||||
url = $url;
|
||||
sha256 = "$hash";
|
||||
};
|
||||
EOF
|
||||
if [ -n "$buildInputs" ]; then
|
||||
cat <<EOF
|
||||
buildInputs = [ $buildInputs ];
|
||||
EOF
|
||||
fi
|
||||
if [ -n "$propagatedBuildInputs" ]; then
|
||||
cat <<EOF
|
||||
propagatedBuildInputs = [ $propagatedBuildInputs ];
|
||||
EOF
|
||||
fi
|
||||
cat <<EOF
|
||||
meta = {
|
||||
homepage = $homepage;
|
||||
description = "$description";
|
||||
license = "$license";
|
||||
};
|
||||
};
|
||||
EOF
|
||||
|
||||
|
|
@ -5,7 +5,6 @@ hydra_eval_jobs \
|
|||
--argstr system x86_64-linux \
|
||||
--argstr system i686-linux \
|
||||
--argstr system x86_64-darwin \
|
||||
--argstr system i686-darwin \
|
||||
--argstr system i686-cygwin \
|
||||
--argstr system i686-freebsd \
|
||||
--arg officialRelease false \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
Two changes:
|
||||
|
||||
* Add an alias for `which', so abcde can find things in store
|
||||
* Choose the right CDROM reader syntax for `cd-paranoia'
|
||||
|
||||
--- abcde-2.5.4/abcde~ 2012-09-18 06:09:31.000000000 -0700
|
||||
+++ abcde-2.5.4/abcde 2012-10-27 00:08:48.000862364 -0700
|
||||
@@ -17,6 +17,11 @@
|
||||
|
||||
VERSION='2.5.4'
|
||||
|
||||
+which ()
|
||||
+{
|
||||
+ type -P $1
|
||||
+}
|
||||
+
|
||||
usage ()
|
||||
{
|
||||
echo "This is abcde v$VERSION."
|
||||
@@ -3497,6 +3502,10 @@
|
||||
for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do
|
||||
if new_checkexec $DEFAULT_CDROMREADER; then
|
||||
CDROMREADERSYNTAX=$DEFAULT_CDROMREADER
|
||||
+ case "$DEFAULT_CDROMREADER" in
|
||||
+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;;
|
||||
+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;;
|
||||
+ esac
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Choose the right CDROM reader syntax for `cd-paranoia'.
|
||||
|
||||
--- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200
|
||||
+++ abcde-2.3.99.6/abcde 2008-10-29 22:55:38.000000000 +0100
|
||||
@@ -3184,7 +3184,10 @@ if [ -n "$DISCID" ] || [ "$CDROMREADERSY
|
||||
if [ "$CDROMREADERSYNTAX" = "" ]; then
|
||||
for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do
|
||||
if new_checkexec $DEFAULT_CDROMREADER; then
|
||||
- CDROMREADERSYNTAX=$DEFAULT_CDROMREADER
|
||||
+ case "$DEFAULT_CDROMREADER" in
|
||||
+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;;
|
||||
+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;;
|
||||
+ esac
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
|
@ -1,19 +1,20 @@
|
|||
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame
|
||||
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue
|
||||
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
|
||||
, makeWrapper }:
|
||||
|
||||
let version = "2.3.99.6";
|
||||
let version = "2.5.4";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "abcde-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz";
|
||||
sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb";
|
||||
sha256 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5";
|
||||
};
|
||||
|
||||
# FIXME: This package does not support MP3 encoding (only Ogg),
|
||||
# nor `distmp3', `eject', etc.
|
||||
|
||||
patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ];
|
||||
patches = [ ./abcde.patch ];
|
||||
|
||||
configurePhase = ''
|
||||
sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
|
||||
|
|
@ -29,25 +30,37 @@ in
|
|||
|
||||
substituteInPlace "abcde" \
|
||||
--replace "/etc/abcde.conf" "$out/etc/abcde.conf"
|
||||
|
||||
'';
|
||||
|
||||
# no ELFs in this package, only scripts
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/bin/cddb-tool" \
|
||||
--replace '#!/bin/sh' '#!${bash}/bin/sh'
|
||||
substituteInPlace "$out/bin/abcde" \
|
||||
--replace '#!/bin/bash' '#!${bash}/bin/bash'
|
||||
# substituteInPlace "$out/bin/cddb-tool" \
|
||||
# --replace '#!/bin/sh' '#!${bash}/bin/sh'
|
||||
# substituteInPlace "$out/bin/abcde" \
|
||||
# --replace '#!/bin/bash' '#!${bash}/bin/bash'
|
||||
|
||||
# generic fixup script should be doing this, but it ignores this file for some reason
|
||||
substituteInPlace "$out/bin/abcde-musicbrainz-tool" \
|
||||
--replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
|
||||
|
||||
wrapProgram "$out/bin/abcde" --prefix PATH ":" \
|
||||
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin"
|
||||
|
||||
wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
|
||||
"${wget}/bin"
|
||||
|
||||
wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \
|
||||
"${wget}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.hispalinux.es/~data/abcde.php;
|
||||
homepage = "http://lly.org/~rcw/abcde/page/";
|
||||
licence = "GPLv2+";
|
||||
description = "A Better CD Encoder (ABCDE)";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
--- abcde-2.3.3/Makefile~ 2005-08-26 00:43:27.000000000 +0200
|
||||
+++ abcde-2.3.3/Makefile 2008-05-26 22:20:17.000000000 +0200
|
||||
@@ -14,13 +14,13 @@ clean:
|
||||
|
||||
install:
|
||||
$(INSTALL) -d -m 755 $(bindir)
|
||||
- $(INSTALL) -m 755 -o 0 abcde $(bindir)
|
||||
- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
|
||||
+ $(INSTALL) -m 755 abcde $(bindir)
|
||||
+ $(INSTALL) -m 755 cddb-tool $(bindir)
|
||||
$(INSTALL) -d -m 755 $(mandir)
|
||||
- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
|
||||
- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
|
||||
+ $(INSTALL) -m 644 abcde.1 $(mandir)
|
||||
+ $(INSTALL) -m 644 cddb-tool.1 $(mandir)
|
||||
$(INSTALL) -d -m 755 $(etcdir)
|
||||
- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
|
||||
+ $(INSTALL) -m 644 abcde.conf $(etcdir)
|
||||
|
||||
tarball:
|
||||
@cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Add an alias for `which'.
|
||||
|
||||
--- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200
|
||||
+++ abcde-2.3.99.6/abcde 2008-10-29 22:49:16.000000000 +0100
|
||||
@@ -15,6 +15,11 @@
|
||||
|
||||
VERSION='2.3.99-$Revision: 222M $'
|
||||
|
||||
+which ()
|
||||
+{
|
||||
+ type -P $1
|
||||
+}
|
||||
+
|
||||
usage ()
|
||||
{
|
||||
echo "This is abcde v$VERSION."
|
||||
|
|
@ -1,28 +1,30 @@
|
|||
{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
|
||||
, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
|
||||
, qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon
|
||||
, strigi, soprano }:
|
||||
, strigi, soprano, qjson, ffmpeg, libofa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
pname = "amarok";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y";
|
||||
sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
|
||||
};
|
||||
|
||||
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
|
||||
patches = ./find-mysql.patch;
|
||||
buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
|
||||
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
|
||||
soprano qca2 libmtp liblastfm libgpod pkgconfig ];
|
||||
soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Popular music player for KDE";
|
||||
license = "GPL";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
commit 9979970f05f25329100168d85a5c4cdc8c084b7a
|
||||
Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
|
||||
Date: Thu Aug 30 12:32:53 2012 +0400
|
||||
|
||||
FindMySQLAmarok.cmake: use PATH_SUFFIXES
|
||||
|
||||
diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
|
||||
index 910b434..4c8b8e8 100644
|
||||
--- a/cmake/modules/FindMySQLAmarok.cmake
|
||||
+++ b/cmake/modules/FindMySQLAmarok.cmake
|
||||
@@ -13,18 +13,17 @@
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
if(NOT WIN32)
|
||||
- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
|
||||
+ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
|
||||
endif(NOT WIN32)
|
||||
|
||||
find_path(MYSQL_INCLUDE_DIR mysql.h
|
||||
- /opt/local/include/mysql5/mysql
|
||||
+ PATHS
|
||||
+ /opt/local/include
|
||||
/opt/mysql/mysql/include
|
||||
- /opt/mysqle/include/mysql
|
||||
- /opt/ports/include/mysql5/mysql
|
||||
- /usr/include/mysql
|
||||
- /usr/local/include/mysql
|
||||
- /usr/mysql/include/mysql
|
||||
- ~/usr/include/mysql
|
||||
+ /opt/mysqle/include
|
||||
+ /opt/ports/include
|
||||
+ /usr/mysql/include
|
||||
+ PATH_SUFFIXES mysql mysql5/mysql
|
||||
)
|
||||
|
||||
if(MYSQLCONFIG_EXECUTABLE)
|
||||
@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE)
|
||||
|
||||
find_library(MYSQLD_PIC_SEPARATE
|
||||
mysqld_pic
|
||||
- PATHS
|
||||
- /usr/lib/mysql
|
||||
+ PATH_SUFFIXES mysql
|
||||
)
|
||||
|
||||
if(MYSQLD_PIC_SEPARATE)
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
{ stdenv, fetchgit, fetchgitrevision
|
||||
, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
|
||||
, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
|
||||
, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig
|
||||
, repository ? "git://git.kde.org/amarok"
|
||||
, branch ? "heads/master"
|
||||
, rev ? fetchgitrevision repository branch
|
||||
, src ? fetchgit {
|
||||
url = repository;
|
||||
rev = rev;
|
||||
}
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
pname = "amarok";
|
||||
version = "live";
|
||||
|
||||
inherit src;
|
||||
|
||||
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
|
||||
buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
|
||||
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
|
||||
soprano qca2 libmtp liblastfm libgpod pkgconfig ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
meta = {
|
||||
description = "Popular music player for KDE";
|
||||
license = "GPL";
|
||||
homepage = http://amarok.kde.org;
|
||||
inherit (kdelibs.meta) maintainers;
|
||||
};
|
||||
}
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
|||
|
||||
# Then build the plugins.
|
||||
(
|
||||
buildNativeInputs="$out $buildNativeInputs" # to find audacious
|
||||
nativeBuildInputs="$out $nativeBuildInputs" # to find audacious
|
||||
source $stdenv/setup
|
||||
rm -rfv audacious-*
|
||||
src=$pluginsSrc
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
name = "audacity-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
|
||||
sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
|
||||
sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc";
|
||||
};
|
||||
buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
|
||||
libvorbis libmad flac id3lib ffmpeg gettext ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bristol-${version}";
|
||||
version = "0.60.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bristol/${name}.tar.gz";
|
||||
sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
|
||||
xlibs.xproto
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
|
||||
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A range of synthesiser, electric piano and organ emulations";
|
||||
homepage = http://bristol.sourceforge.net;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +1,25 @@
|
|||
{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
|
||||
, libglade, lv2, pkgconfig }:
|
||||
{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
|
||||
, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calf-${version}";
|
||||
version = "0.0.18.6";
|
||||
version = "0.0.19-rc7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/calf/${name}.tar.gz";
|
||||
sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
|
||||
sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
|
||||
buildInputs = [
|
||||
cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
|
||||
libglade lv2 pkgconfig
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://calf.sourceforge.net;
|
||||
description = "A set of high quality open source audio plugins for musicians";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, fetchurl, cmake, libsndfile, flex, bison
|
||||
, alsaLib ? null
|
||||
, pulseaudio ? null
|
||||
, tcltk ? null
|
||||
|
||||
# maybe csound can be compiled with support for those, see configure output
|
||||
# , ladspa ? null
|
||||
# , fluidsynth ? null
|
||||
# , jack ? null
|
||||
# , gmm ? null
|
||||
# , wiiuse ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "csound5.18.02";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz;
|
||||
sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
|
||||
|
||||
meta = {
|
||||
description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
|
||||
homepage = http://www.csounds.com/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
|
||||
, libxslt, lv2, pkgconfig, premake, xlibs }:
|
||||
|
||||
let
|
||||
rev = "7815b3545978e";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "distrho-${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
|
||||
inherit rev;
|
||||
sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
|
||||
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
|
||||
sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
|
||||
-i ports/hybridreverb2/source/SystemConfig.cpp
|
||||
sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake
|
||||
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
|
||||
xlibs.libXinerama xlibs.libXrender
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
sh ./scripts/premake-update.sh linux
|
||||
make standalone
|
||||
make lv2
|
||||
|
||||
# generate lv2 ttl
|
||||
sh scripts/generate-ttl.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp bin/standalone/* $out/bin/
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -a bin/lv2/* $out/lib/lv2/
|
||||
|
||||
# HybridReverb2 data
|
||||
mkdir -p $out/etc/HybridReverb2
|
||||
cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
|
||||
mkdir -p $out/share
|
||||
cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://distrho.sourceforge.net;
|
||||
description = "A collection of cross-platform audio effects and plugins";
|
||||
longDescription = ''
|
||||
Includes:
|
||||
3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
|
||||
drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
|
||||
TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
|
||||
Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
|
||||
drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
|
||||
TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
|
||||
'';
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
|
||||
, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "guitarix-${version}";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
|
||||
sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
|
||||
gtkmm fftw librdf ladspaH boost
|
||||
];
|
||||
|
||||
configurePhase = "python waf configure --prefix=$out";
|
||||
|
||||
buildPhase = "python waf build";
|
||||
|
||||
installPhase = "python waf install";
|
||||
|
||||
meta = {
|
||||
description = "A virtual guitar amplifier for Linux running with JACK";
|
||||
longDescription = ''
|
||||
guitarix is a virtual guitar amplifier for Linux running with
|
||||
JACK (Jack Audio Connection Kit). It is free as in speech and
|
||||
free as in beer. Its free sourcecode allows to build it for
|
||||
other UNIX-like systems also, namely for BSD and for MacOSX.
|
||||
|
||||
It takes the signal from your guitar as any real amp would do:
|
||||
as a mono-signal from your sound card. Your tone is processed by
|
||||
a main amp and a rack-section. Both can be routed separately and
|
||||
deliver a processed stereo-signal via JACK. You may fill the
|
||||
rack with effects from more than 25 built-in modules spanning
|
||||
from a simple noise-gate to brain-slashing modulation-fx like
|
||||
flanger, phaser or auto-wah. Your signal is processed with
|
||||
minimum latency. On any properly set-up Linux-system you do not
|
||||
need to wait for more than 10 milli-seconds for your playing to
|
||||
be delivered, processed by guitarix.
|
||||
|
||||
guitarix offers the range of sounds you would expect from a
|
||||
full-featured universal guitar-amp. You can get crisp
|
||||
clean-sounds, nice overdrive, fat distortion and a diversity of
|
||||
crazy sounds never heard before.
|
||||
'';
|
||||
homepage = http://guitarix.sourceforge.net/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.astsmtl ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
|
||||
sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
|
||||
'';
|
||||
sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
|
||||
'';
|
||||
|
||||
# why doesn't scons find librdf?
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
|
||||
|
||||
buildNativeInputs = [ groff ];
|
||||
nativeBuildInputs = [ groff ];
|
||||
buildInputs = [ id3lib ];
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, fetchgit, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "lastwatch-${version}";
|
||||
namePrefix = "";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/aszlig/LastWatch.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92";
|
||||
};
|
||||
|
||||
pythonPath = [
|
||||
pythonPackages.pyinotify
|
||||
pythonPackages.pylast
|
||||
pythonPackages.mutagen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = pythonPath;
|
||||
|
||||
installCommand = "python setup.py install --prefix=$out";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/aszlig/LastWatch";
|
||||
description = "An inotify-based last.fm audio scrobbler";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.5.8";
|
||||
version = "0.5.10";
|
||||
name = "ncmpcpp-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
|
||||
sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
|
||||
url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2";
|
||||
sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opus-tools-0.1.5";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
|
||||
sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg libao pkgconfig libopus ];
|
||||
|
||||
meta = {
|
||||
description = "Tools to work with opus encoded audio streams";
|
||||
homepage = http://www.opus-codec.org/;
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,17 +2,17 @@
|
|||
, libglademm, libcanberra, intltool, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pavucontrol-0.9.10";
|
||||
name = "pavucontrol-1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
|
||||
sha256 = "0g2sd9smwwpnyq8yc65dl9z0iafj2rrimi8v58wkxx98vhnnvsby";
|
||||
url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz";
|
||||
sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
|
||||
intltool gettext ];
|
||||
|
||||
configureFlags = "--disable-lynx";
|
||||
configureFlags = "--disable-lynx --disable-gtk3";
|
||||
|
||||
meta = {
|
||||
description = "PulseAudio Volume Control";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv, fetchurl, pythonPackages, gettext, pyqt4
|
||||
, pkgconfig, libdiscid, libofa, ffmpeg }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "picard-${version}";
|
||||
namePrefix = "";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz";
|
||||
md5 = "57abb76632a423760f336ac11da5c149";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig
|
||||
ffmpeg
|
||||
libofa
|
||||
gettext
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonPackages.mutagen
|
||||
pyqt4
|
||||
libdiscid
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
python setup.py config
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
python setup.py build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --prefix="$out"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
|
||||
description = "The official MusicBrainz tagger";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,22 @@
|
|||
{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
name = "qjackctl-${version}";
|
||||
|
||||
# some dependencies such as killall have to be installed additionally
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
|
||||
sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247";
|
||||
sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 alsaLib jackaudio dbus ];
|
||||
|
||||
configureFlags = "--enable-jack-version";
|
||||
|
||||
meta = {
|
||||
description = "qt jackd control gui tool";
|
||||
description = "A Qt application to control the JACK sound server daemon";
|
||||
homepage = http://qjackctl.sourceforge.net/;
|
||||
license = "GPL";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }:
|
||||
|
||||
let
|
||||
rev = "ec6b85e19e24ed";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swh-lv2-${rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/swh/lv2.git";
|
||||
inherit rev;
|
||||
sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
|
||||
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
|
||||
'';
|
||||
|
||||
buildInputs = [ fftwSinglePrec lv2 pkgconfig ];
|
||||
|
||||
installPhase = "make install-system";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://plugin.org.uk;
|
||||
description = "LV2 version of Steve Harris' SWH plugins";
|
||||
longDescription = ''
|
||||
SWH plugins include:
|
||||
amp, fast overdrive, overdrive (with colourisation), comb
|
||||
filter, waveshaper, ringmod, divider, diode, decliper, pitch
|
||||
scaler, 16 band equaliser, sinus wavewrapper, hermes filter,
|
||||
chorus, flanger, decimater, oscillator, gverb, phasers, harmonic
|
||||
generators, surround encoders and more.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
|
||||
minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
|
||||
, fontconfig, freetype, pam, consolekit, dbus_libs }:
|
||||
, fontconfig, freetype, pam, dbus_libs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slim-1.3.4";
|
||||
|
|
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
|
||||
pam dbus_libs
|
||||
] ++ stdenv.lib.optional (consolekit != null) consolekit;
|
||||
];
|
||||
|
||||
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
|
||||
|
||||
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
|
||||
cmakeFlags = [ "-DUSE_PAM=1" ];
|
||||
|
||||
NIX_CFLAGS_LINK = "-lXmu";
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenv, fetchurl, zlib, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aewan-${version}";
|
||||
version = "1.0.01";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/aewan/${name}.tar.gz";
|
||||
sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ncurses ];
|
||||
|
||||
meta = {
|
||||
description = "Ascii-art Editor Without A Name";
|
||||
homepage = "http://aewan.sourceforge.net/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -49,6 +49,8 @@ let
|
|||
# Create desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
mkdir -p $out/share/pixmaps
|
||||
ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
|
||||
''; # */
|
||||
|
||||
meta = {
|
||||
|
|
@ -164,14 +166,13 @@ in {
|
|||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz;
|
||||
sha256 = "1vcr49qm6rsbgzi9d43ggmby68pdigqcy55l5vy1gmixqks3g6s0";
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
|
||||
sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk.tar.gz;
|
||||
sha256 = "1zlv80idkkdda05ks4biknbkczp24b2xki81ik5nygrjg29jqgnz";
|
||||
url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
|
||||
sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,23 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ed-1.5";
|
||||
name = "ed-1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ed/${name}.tar.gz";
|
||||
sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp";
|
||||
sha256 = "0c908wb5pm48rjrrfbm5dhrqzys8f1dbvi90dn0vgwjzk80l2hl9";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
/* FIXME: Tests currently fail on Darwin:
|
||||
|
||||
building test scripts for ed-1.5...
|
||||
testing ed-1.5...
|
||||
*** Output e1.o of script e1.ed is incorrect ***
|
||||
*** Output r3.o of script r3.ed is incorrect ***
|
||||
make: *** [check] Error 127
|
||||
|
||||
*/
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
crossAttrs = {
|
||||
compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
preConfigure() {
|
||||
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
|
||||
echo "libc: $libc"
|
||||
|
||||
case "${system}" in
|
||||
x86_64-*) glibclibdir=lib64 ;;
|
||||
*) glibclibdir=lib ;;
|
||||
esac
|
||||
|
||||
for i in src/s/*.h src/m/*.h; do
|
||||
substituteInPlace $i \
|
||||
--replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
|
||||
--replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
|
||||
--replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
|
||||
--replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
|
||||
--replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
|
||||
--replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
|
||||
done
|
||||
|
||||
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
|
||||
substituteInPlace $i --replace /bin/pwd pwd
|
||||
done
|
||||
}
|
||||
|
||||
genericBuild
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
{ xawSupport ? true
|
||||
, xpmSupport ? true
|
||||
, xaw3dSupport ? false
|
||||
, gtkGUI ? false
|
||||
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
|
||||
, pkgconfig ? null, gtk ? null
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
assert xawSupport && !xaw3dSupport -> libXaw != null;
|
||||
assert xawSupport && xaw3dSupport -> Xaw3d != null;
|
||||
assert xpmSupport -> libXpm != null;
|
||||
assert gtkGUI -> pkgconfig != null && gtk != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-22.3";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.gz";
|
||||
sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv";
|
||||
};
|
||||
|
||||
buildInputs = [ncurses x11]
|
||||
++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw)
|
||||
++ stdenv.lib.optional xpmSupport libXpm
|
||||
++ stdenv.lib.optionals gtkGUI [pkgconfig gtk];
|
||||
|
||||
configureFlags =
|
||||
stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
|
||||
|
||||
postInstall = ''
|
||||
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
|
||||
;; nixos specific load-path
|
||||
(when (getenv "NIX_PROFILES") (setq load-path
|
||||
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
|
||||
(split-string (getenv "NIX_PROFILES"))))
|
||||
load-path)))
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GNU Emacs, *the* text editor";
|
||||
|
||||
longDescription = ''
|
||||
GNU Emacs is an extensible, customizable text editor—and more.
|
||||
At its core is an interpreter for Emacs Lisp, a dialect of the
|
||||
Lisp programming language with extensions to support text
|
||||
editing.
|
||||
'';
|
||||
|
||||
homepage = http://www.gnu.org/software/emacs/;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
|
||||
|
||||
clangStdenv.mkDerivation {
|
||||
name = "emacs-clang-complete-async-20130218";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/Golevka/emacs-clang-complete-async.git";
|
||||
rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
|
||||
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
|
||||
};
|
||||
|
||||
buildInputs = [ llvm clangUnwrapped ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install -m 755 clang-complete $out/bin
|
||||
install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Golevka/emacs-clang-complete-async";
|
||||
description = "An emacs plugin to complete C and C++ code using libclang";
|
||||
license = "GPLv3+";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flymake-cursor-0.1.4";
|
||||
name = "flymake-cursor-0.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
|
||||
sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02";
|
||||
sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "graphviz-dot-mode-0.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el";
|
||||
sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
unpackPhase = ":";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
|
||||
emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.graphviz.org/";
|
||||
description = "An emacs mode for the DOT Language, used by graphviz";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "htmlize-1.37";
|
||||
name = "htmlize-1.43";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
|
||||
sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160";
|
||||
sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,22 +1,32 @@
|
|||
{ stdenv, fetchurl, emacs, texinfo }:
|
||||
{ stdenv, fetchurl, emacs, texinfo, unzip }:
|
||||
|
||||
let
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "magit-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz";
|
||||
sha256 = "0zp5qxippmalin2fr73w2alf2w7ilcahmybzdvgn4ch2s3dgvzcz";
|
||||
url = "https://github.com/magit/magit/zipball/${version}";
|
||||
sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i";
|
||||
name = "magit-${version}.zip";
|
||||
};
|
||||
|
||||
buildInputs = [emacs texinfo];
|
||||
buildInputs = [ emacs texinfo unzip ];
|
||||
|
||||
configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )";
|
||||
|
||||
# Add (require 'magit-site-init) to your ~/.emacs file to set-up magit mode.
|
||||
postInstall = ''
|
||||
mv $out/etc/emacs/site-start.d/50magit.el $out/share/emacs/site-lisp/magit-site-init.el
|
||||
sed -i -e 's|50magit|magit-site-init|' $out/share/emacs/site-lisp/magit-site-init.el
|
||||
rmdir $out/etc/emacs/site-start.d $out/etc/emacs $out/etc
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/magit/magit";
|
||||
description = "Magit, an Emacs interface to Git";
|
||||
license = "GPLv3+";
|
||||
|
||||
longDescription = ''
|
||||
With Magit, you can inspect and modify your Git repositories with
|
||||
|
|
@ -30,8 +40,6 @@ stdenv.mkDerivation {
|
|||
save you from learning Git itself.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
homepage = "https://github.com/magit/magit";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [ simons ludo ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
mkdir -p $out/emacs/site-lisp
|
||||
cd $out/emacs/site-lisp
|
||||
tar xvfz $src
|
||||
mv nxml-mode-*/* .
|
||||
rmdir nxml-mode-*
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{stdenv, fetchurl}: stdenv.mkDerivation {
|
||||
name = "nxml-mode-20041004";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://nixos.org/tarballs/nxml-mode-20041004.tar.gz;
|
||||
md5 = "ac137024cf337d6f11d8ab278d39b4db";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +1,24 @@
|
|||
{ fetchurl, stdenv, emacs, texinfo, which }:
|
||||
{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org-7.8.03";
|
||||
name = "org-7.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/${name}.tar.gz";
|
||||
sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958";
|
||||
sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs texinfo ];
|
||||
|
||||
patchPhase =
|
||||
'' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
|
||||
'';
|
||||
buildInputs = [ emacs ];
|
||||
nativeBuildInputs = [ texinfo texLive ];
|
||||
|
||||
configurePhase =
|
||||
'' sed -i Makefile \
|
||||
-e "s|^prefix=.*$|prefix=$out|g"
|
||||
'' sed -i mk/default.mk \
|
||||
-e "s|^prefix\t=.*$|prefix=$out|g"
|
||||
'';
|
||||
|
||||
#XXX: fails because of missing UTILITIES/manfull.pl, currently not
|
||||
# included in the release tarball, but git.
|
||||
|
||||
#postBuild =
|
||||
# '' make doc
|
||||
# '';
|
||||
postBuild =
|
||||
'' make doc
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
'' make install install-info
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchgit, emacs, xmlRpc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org2blog-0.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/punchagan/org2blog.git;
|
||||
rev = "338abe30e9bc89684f8384f8deaf826b63844da6";
|
||||
sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
propagatedUserEnvPkgs = [ xmlRpc ];
|
||||
|
||||
buildPhase = ''
|
||||
emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs.";
|
||||
homepage = https://github.com/punchagan/org2blog;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +1,23 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
{stdenv, fetchgit, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sunrise-commander-6";
|
||||
name = "sunrise-commander-6r435";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.emacswiki.org/emacs/download/sunrise-commander.el";
|
||||
sha256 = "1bbpm00nc7ry0f2k4zaqbvp6w9py31asfcr9hddggc138pnfajvq";
|
||||
src = fetchgit {
|
||||
url = https://github.com/escherdragon/sunrise-commander.git;
|
||||
rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1";
|
||||
sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src sunrise-commander.el
|
||||
emacs --batch -f batch-byte-compile sunrise-commander.el
|
||||
emacs -L . --batch -f batch-byte-compile *.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install sunrise-commander.el* $out/share/emacs/site-lisp
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xml-rpc-1.6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
|
||||
sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
|
||||
};
|
||||
|
||||
phases = [ "buildPhase" "installPhase"];
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp $src xml-rpc.el
|
||||
emacs --batch -f batch-byte-compile xml-rpc.el
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install xml-rpc.el* $out/share/emacs/site-lisp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An elisp implementation of clientside XML-RPC.";
|
||||
homepage = https://launchpad.net/xml-rpc-el;
|
||||
license = "GPLv3+";
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
|
||||
|
||||
let
|
||||
version = "1.22";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geany-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.geany.org/${name}.tar.gz";
|
||||
md5 = "1cb7f6cea8e301c416211786cec474fa";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 which pkgconfig intltool ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
|
||||
|
||||
meta = {
|
||||
description = "A GTK2 small and ligthweight IDE.";
|
||||
longDescription = ''
|
||||
Geany is a small and lightweight Integrated Development Environment.
|
||||
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
|
||||
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
|
||||
Geany only requires the GTK2 runtime libraries.
|
||||
Some basic features of Geany:
|
||||
- Syntax highlighting
|
||||
- Code folding
|
||||
- Symbol name auto-completion
|
||||
- Construct completion/snippets
|
||||
- Auto-closing of XML and HTML tags
|
||||
- Call tips
|
||||
- Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
|
||||
- Symbol lists
|
||||
- Code navigation
|
||||
- Build system to compile and execute your code
|
||||
- Simple project management
|
||||
- Plugin interface
|
||||
'';
|
||||
homepage = "http://www.geany.org/";
|
||||
license = "GPL";
|
||||
maintainers = [ stdenv.lib.maintainers.bbenoist ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,10 +9,10 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
name = "gobby-0.4.93";
|
||||
name = "gobby-0.4.94";
|
||||
src = fetchurl {
|
||||
url = "http://releases.0x539.de/gobby/${name}.tar.gz";
|
||||
sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4";
|
||||
sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hexedit-${version}";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://rigaux.org/${name}.src.tgz";
|
||||
sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = {
|
||||
description = "View and edit files in hexadecimal or in ASCII";
|
||||
homepage = "http://prigaux.chez.com/hexedit.html";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ stdenv.mkDerivation {
|
|||
name = "jedit-4.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
|
||||
url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
|
||||
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
name = jedit.name+"_startscript";
|
||||
|
||||
java = jre+"/bin/java";
|
||||
jeditjar = jedit+"/lib/jedit.jar";
|
||||
|
||||
phases = "buildPhase";
|
||||
|
||||
buildPhase = "
|
||||
mkdir -p \$out/bin
|
||||
cat > \$out/bin/${jedit.name} << EOF
|
||||
#!/bin/sh
|
||||
exec $java -jar $jeditjar \\$*
|
||||
EOF
|
||||
chmod +x \$out/bin/${jedit.name}
|
||||
";
|
||||
}
|
||||
|
|
@ -3,17 +3,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pname = "kdevelop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
|
||||
sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
|
||||
sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs";
|
||||
};
|
||||
|
||||
buildInputs = [ kdevplatform kdebase_workspace okteta ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
|
||||
nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
|
||||
|
||||
patches =
|
||||
[ ( fetchurl {
|
||||
url = https://git.reviewboard.kde.org/r/105211/diff/raw/;
|
||||
name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x
|
||||
sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0";
|
||||
} )
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake gettext ];
|
||||
nativeBuildInputs = [ cmake gettext ];
|
||||
buildInputs = [ kdelibs ];
|
||||
|
||||
# for KDE 4.7 the nl translations fail since kile-2.1.2
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, gtkmozembedsharp, monodoc
|
||||
, perl, perlXMLParser, pkgconfig
|
||||
, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
|
||||
, mozilla
|
||||
, mozilla, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -14,8 +14,6 @@ stdenv.mkDerivation {
|
|||
md5 = "8c33df5629b0676b7ab552854c1de6fd";
|
||||
};
|
||||
|
||||
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
|
||||
|
||||
patches = [./prefix.patch];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -24,5 +22,5 @@ stdenv.mkDerivation {
|
|||
gtkmozembedsharp monodoc
|
||||
];
|
||||
|
||||
inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
|
||||
inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
|
||||
{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "monodoc-1.0.6";
|
||||
|
|
@ -9,9 +9,7 @@ stdenv.mkDerivation {
|
|||
md5 = "f2fc27e8e4717d90dc7efa2450625693";
|
||||
};
|
||||
|
||||
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
|
||||
|
||||
buildInputs = [mono gtksharp pkgconfig];
|
||||
|
||||
inherit gtksharp;
|
||||
inherit gtksharp makeWrapper;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,28 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "nano";
|
||||
version = "2.2.3";
|
||||
version = "2.2.6";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${name}.tar.gz";
|
||||
sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
|
||||
sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses gettext ];
|
||||
|
||||
configureFlags = ''
|
||||
--disable-browser
|
||||
--disable-help
|
||||
--disable-justify
|
||||
--disable-mouse
|
||||
--disable-operatingdir
|
||||
--disable-speller
|
||||
--disable-tabcomp
|
||||
--disable-wrapping
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.nano-editor.org/;
|
||||
description = "A small, user-friendly console text editor";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, fetchurl, x11, motif, libXpm}:
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nedit-5.5";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
inherit motif;
|
||||
buildInputs = [x11 motif libXpm];
|
||||
|
||||
buildFlags = if stdenv.system == "i686-linux" then "linux" else "";
|
||||
buildFlags = if stdenv.isLinux then "linux" else "";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.nedit.org;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "netbeans";
|
||||
exec = "netbeans";
|
||||
comment = "Integrated Development Environment";
|
||||
desktopName = "Netbeans IDE";
|
||||
genericName = "Integrated Development Environment";
|
||||
categories = "Application;Development;";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "netbeans-7.2";
|
||||
src = fetchurl {
|
||||
url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
|
||||
sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
|
||||
};
|
||||
buildCommand = ''
|
||||
# Unpack and copy the stuff
|
||||
unzip $src
|
||||
mkdir -p $out
|
||||
cp -a netbeans $out
|
||||
|
||||
# Create a wrapper capable of starting it
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
|
||||
--prefix PATH : ${jdk}/bin:${which}/bin
|
||||
|
||||
# Create desktop item, so we can pick it from the KDE/GNOME menu
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
meta = {
|
||||
description = "An integrated development environment for Java, C, C++ and PHP";
|
||||
maintainers = [ stdenv.lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}:
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo];
|
||||
in
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sublimetext-2.0.1";
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
name = "sublimetext-2.0.1.tar.bz2";
|
||||
url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1.tar.bz2;
|
||||
sha256 = "1x6vmlfn5mdbf23nyfr7dhhi6y60lnpcmqj59svl3bzvayijsxaf";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
name = "sublimetext-2.0.1.tar.bz2";
|
||||
url = http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1%20x64.tar.bz2;
|
||||
sha256 = "0174dnp9zika5as25mcls5y0qzhh8mnc5ajxsxz7qjrk4lrzk3c5";
|
||||
};
|
||||
buildCommand = ''
|
||||
tar xvf ${src}
|
||||
mkdir -p $out/bin
|
||||
mv Sublime* $out/sublime
|
||||
ln -s $out/sublime/sublime_text $out/bin/sublime
|
||||
|
||||
echo ${libPath}
|
||||
patchelf \
|
||||
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||
--set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
|
||||
$out/sublime/sublime_text
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Sublime Text is a sophisticated text editor for code, markup and prose.";
|
||||
license = "unfree";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{ stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vbindiff-${version}";
|
||||
version = "3.0_beta4";
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
|
||||
sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A terminal visual binary diff viewer";
|
||||
homepage = "http://www.cjmweb.net/vbindiff/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@ composableDerivation {} {
|
|||
|
||||
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
|
||||
|
||||
buildNativeInputs = [ncurses pkgconfig]
|
||||
nativeBuildInputs = [ncurses pkgconfig]
|
||||
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib
|
||||
libICE ];
|
||||
|
||||
|
|
@ -27,11 +27,11 @@ composableDerivation {} {
|
|||
// edf { name = "xsmp"; } #Disable XSMP session management
|
||||
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
|
||||
// edf { name = "mzscheme"; } #Include MzScheme interpreter.
|
||||
// edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter.
|
||||
// edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
|
||||
// edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
|
||||
// edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
|
||||
// edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
|
||||
// edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
|
||||
// edf { name = "python"; feat = "pythoninterp"; enable = { nativeBuildInputs = [python]; }; } #Include Python interpreter.
|
||||
// edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
|
||||
// edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
|
||||
// edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
|
||||
// edf { name = "cscope"; } #Include cscope interface.
|
||||
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
|
||||
// edf { name = "netbeans"; } #Disable NetBeans integration support.
|
||||
|
|
@ -42,18 +42,18 @@ composableDerivation {} {
|
|||
// edf { name = "fontset"; } #Include X fontset output support.
|
||||
// edf { name = "acl"; } #Don't check for ACL support.
|
||||
// edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
|
||||
// edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
|
||||
// edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
|
||||
;
|
||||
|
||||
cfg = {
|
||||
pythonSupport = getConfig [ "vim" "python" ] true;
|
||||
darwinSupport = getConfig [ "vim" "darwin" ] false;
|
||||
nlsSupport = getConfig [ "vim" "nls" ] false;
|
||||
tclSupport = getConfig [ "vim" "tcl" ] false;
|
||||
multibyteSupport = getConfig [ "vim" "multibyte" ] false;
|
||||
cscopeSupport = getConfig [ "vim" "cscope" ] false;
|
||||
pythonSupport = config.vim.python or true;
|
||||
darwinSupport = config.vim.darwin or false;
|
||||
nlsSupport = config.vim.nls or false;
|
||||
tclSupport = config.vim.tcl or false;
|
||||
multibyteSupport = config.vim.multibyte or false;
|
||||
cscopeSupport = config.vim.cscope or false;
|
||||
# add .nix filetype detection and minimal syntax highlighting support
|
||||
ftNixSupport = getConfig [ "vim" "ftNix" ] true;
|
||||
ftNixSupport = config.vim.ftNix or true;
|
||||
};
|
||||
|
||||
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
|
||||
|
|
@ -70,11 +70,11 @@ composableDerivation {} {
|
|||
|
||||
postInstall = "
|
||||
rpath=`patchelf --print-rpath \$out/bin/vim`;
|
||||
for i in $\buildNativeInputs; do
|
||||
for i in \$nativeBuildInputs; do
|
||||
echo adding \$i/lib
|
||||
rpath=\$rpath:\$i/lib
|
||||
done
|
||||
echo \$buildNativeInputs
|
||||
echo \$nativeBuildInputs
|
||||
echo \$rpath
|
||||
patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
|
||||
";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ ncurses pkgconfig ];
|
||||
buildNativeInputs = [ gettext ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-multibyte"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zile-2.4.7";
|
||||
name = "zile-2.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${name}.tar.gz";
|
||||
sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc";
|
||||
sha256 = "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses boehmgc ];
|
||||
buildNativeInputs = [ help2man perl ];
|
||||
nativeBuildInputs = [ help2man perl ];
|
||||
|
||||
# `help2man' wants to run Zile, which fails when cross-compiling.
|
||||
crossAttrs.nativeBuildInputs = [];
|
||||
|
||||
# Tests can't be run because most of them rely on the ability to
|
||||
# fiddle with the terminal.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, bzip2
|
||||
, freetype
|
||||
, graphviz
|
||||
, ghostscript
|
||||
, ghostscript ? null
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
|
|
@ -27,16 +27,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs";
|
||||
};
|
||||
|
||||
configureFlags = ''
|
||||
configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") ''
|
||||
--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
|
||||
--with-gslib
|
||||
'' + ''
|
||||
--with-frozenpaths
|
||||
${if librsvg != null then "--with-rsvg" else ""}
|
||||
'';
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg
|
||||
libtool jasper libX11 ];
|
||||
[ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg
|
||||
libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
|
||||
|
||||
buildInputs = [ tetex graphviz ];
|
||||
|
||||
|
|
@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
|
|||
'' else "";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.imagemagick.org;
|
||||
homepage = http://www.imagemagick.org/;
|
||||
description = "A software suite to create, edit, compose, or convert bitmap images";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./install.patch ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
NIX_LDFLAGS = "-llcms -ljpeg";
|
||||
|
||||
|
|
|
|||
|
|
@ -3,24 +3,24 @@
|
|||
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
|
||||
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
|
||||
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
|
||||
, openexr, pixman, pkgconfig, sqlite }:
|
||||
, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0";
|
||||
version = "1.1.2";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
|
||||
sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
|
||||
sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
|
||||
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
|
||||
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite
|
||||
librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
|
|||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
|
||||
|
||||
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
|
||||
Author: Tim Harder <radhermit@gmail.com>
|
||||
Date: Wed Sep 21 14:13:55 2011 -0700
|
||||
|
||||
Fix build with libpng-1.5
|
||||
|
||||
Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and
|
||||
Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore
|
||||
via the png.h header.
|
||||
|
||||
diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c
|
||||
index 40c7d48..c7be566 100644
|
||||
--- a/src/imageio/format/png.c
|
||||
+++ b/src/imageio/format/png.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <stdio.h>
|
||||
#include <png.h>
|
||||
#include <inttypes.h>
|
||||
+#include <zlib.h>
|
||||
|
||||
DT_MODULE(1)
|
||||
|
||||
|
|
@ -16,10 +16,16 @@ stdenv.mkDerivation rec {
|
|||
libxslt docbook_xsl libart_lgpl
|
||||
] ++ stdenv.lib.optional withGNOME libgnomeui;
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool perl ];
|
||||
nativeBuildInputs = [ pkgconfig intltool perl ];
|
||||
|
||||
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
|
||||
|
||||
patches = [ ./glib-top-level-header.patch ];
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
|
||||
|
||||
meta = {
|
||||
description = "Gnome Diagram drawing software";
|
||||
homepage = http://live.gnome.org/Dia;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,471 @@
|
|||
diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c
|
||||
--- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400
|
||||
+++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400
|
||||
@@ -50,7 +50,7 @@
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/xmlerror.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "app_procs.h"
|
||||
diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c
|
||||
--- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400
|
||||
+++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <shellapi.h>
|
||||
#include <Shlwapi.h>
|
||||
#include <glib.h>
|
||||
-#include <glib/gprintf.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/**
|
||||
* PROTOTYPES:
|
||||
diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c
|
||||
--- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */
|
||||
#include <gtk/gtk.h>
|
||||
diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c
|
||||
--- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400
|
||||
+++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h> /* g_access() and friends */
|
||||
+#include <glib.h> /* g_access() and friends */
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef W_OK
|
||||
diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c
|
||||
--- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
#include <gmodule.h>
|
||||
|
||||
#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */
|
||||
diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git
|
||||
--- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400
|
||||
@@ -4137,7 +4137,7 @@
|
||||
plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c
|
||||
plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c
|
||||
plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c
|
||||
- plug-ins/xslt/xslt.c : use <glib/gstdio.h> to match GLib's filename
|
||||
+ plug-ins/xslt/xslt.c : use <glib.h> to match GLib's filename
|
||||
encoding to the io functions used, that is: g_open, g_fopen, g_stat,
|
||||
g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen,
|
||||
g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...)
|
||||
@@ -5995,7 +5995,7 @@
|
||||
Also special case strings starting with \tex - i.e. dont escape them -
|
||||
to keep the use-case of direct tex input.
|
||||
|
||||
- * lib/debug.c : #include <glib/gprintf.h> not just <gprintf.h>
|
||||
+ * lib/debug.c : #include <glib.h>
|
||||
|
||||
|
||||
2006-01-14 Hans Breuer <hans@breuer.org>
|
||||
@@ -6207,7 +6207,7 @@
|
||||
* lib/makefile.msc : build debug.obj
|
||||
|
||||
* plug-ins/makefile.msc : building pgf in the right alphabetical order
|
||||
- * plug-ins/pgf/render_pgf.c : include <glib/gprintf.h>
|
||||
+ * plug-ins/pgf/render_pgf.c : include <glib.h>
|
||||
|
||||
2005-12-08 Lars Clausen <lars@raeder.dk>
|
||||
|
||||
diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c
|
||||
--- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <glib/gprintf.h>
|
||||
+#include <glib.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "debug.h"
|
||||
diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c
|
||||
--- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/** Get the name of a subdirectory of our data directory.
|
||||
* This function does not create the subdirectory, just make the correct name.
|
||||
diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c
|
||||
--- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <fcntl.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/parserInternals.h>
|
||||
diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c
|
||||
--- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400
|
||||
@@ -27,8 +27,8 @@
|
||||
#include "custom_util.h"
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
-#include <glib/gstrfuncs.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
+#include <glib.h>
|
||||
#include <libxml/parser.h>
|
||||
|
||||
/*
|
||||
diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c
|
||||
--- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "dia_xml_libxml.h"
|
||||
|
||||
#include <string.h>
|
||||
-#include <glib/gprintf.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#define DEFAULT_WIDTH 1.0
|
||||
#define DEFAULT_HEIGHT 1.0
|
||||
diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c
|
||||
--- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
#ifdef HAVE_UNIST_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c
|
||||
--- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <errno.h>
|
||||
#define G_LOG_DOMAIN "DiaCairo"
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/*
|
||||
* To me the following looks rather suspicious. Why do we need to compile
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c
|
||||
--- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <errno.h>
|
||||
#define G_LOG_DOMAIN "DiaCairo"
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#ifdef HAVE_PANGOCAIRO_H
|
||||
#include <pango/pangocairo.h>
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c
|
||||
--- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <glib.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c
|
||||
--- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
#define G_LOG_DOMAIN "DiaRenderScript"
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "filter.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c
|
||||
--- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <math.h>
|
||||
#include <glib.h>
|
||||
#include <errno.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "autocad_pal.h"
|
||||
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c
|
||||
--- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c
|
||||
--- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c
|
||||
--- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400
|
||||
+++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "intl.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c
|
||||
--- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400
|
||||
@@ -43,7 +43,7 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "render_metapost.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c
|
||||
--- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400
|
||||
@@ -61,8 +61,8 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gprintf.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "render_pgf.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c
|
||||
--- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c
|
||||
--- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400
|
||||
@@ -55,7 +55,7 @@
|
||||
#include <locale.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "render_eps.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c
|
||||
--- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400
|
||||
@@ -50,7 +50,7 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "render_pstricks.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c
|
||||
--- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include <Python.h>
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include <locale.h>
|
||||
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c
|
||||
--- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400
|
||||
@@ -40,7 +40,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
/* the dots per centimetre to render this diagram at */
|
||||
/* this matches the setting `100%' setting in dia. */
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c
|
||||
--- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400
|
||||
@@ -30,7 +30,7 @@
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include <libxml/entities.h>
|
||||
#include <libxml/tree.h>
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c
|
||||
--- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400
|
||||
@@ -32,11 +32,12 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <glib.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <locale.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c
|
||||
--- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <libxml/tree.h>
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp
|
||||
--- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400
|
||||
+++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c
|
||||
--- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400
|
||||
@@ -40,7 +40,7 @@
|
||||
#include <errno.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c
|
||||
--- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <locale.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c
|
||||
--- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400
|
||||
@@ -40,7 +40,7 @@
|
||||
#include <locale.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "intl.h"
|
||||
#include "message.h"
|
||||
diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c
|
||||
--- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500
|
||||
+++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include <glib/gstdio.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "filter.h"
|
||||
#include "intl.h"
|
||||
diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c
|
||||
--- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500
|
||||
+++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <glib-object.h>
|
||||
|
||||
#if GLIB_CHECK_VERSION(2,16,0)
|
||||
-#include <glib/gtestutils.h>
|
||||
+#include <glib.h>
|
||||
#endif
|
||||
#include "dialib.h"
|
||||
|
||||
diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c
|
||||
--- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500
|
||||
+++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <glib-object.h>
|
||||
|
||||
#if GLIB_CHECK_VERSION(2,16,0)
|
||||
-#include <glib/gtestutils.h>
|
||||
+#include <glib.h>
|
||||
#endif
|
||||
|
||||
#include "object.h"
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ cmake automoc4 pkgconfig ];
|
||||
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
|
||||
|
||||
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
|
||||
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [djvulibre qt4];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
patches = [ ./djview4-qt-4.8.patch ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
|
||||
, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
|
||||
, monoDLLFixer
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "f-spot-0.0.10";
|
||||
|
||||
builder = ./builder.sh;
|
||||
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
|
||||
|
||||
inherit makeWrapper;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig which ];
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
buildInputs =
|
||||
[ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
|
||||
imagemagick curl saneBackends
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
|
||||
, libXinerama, curl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "feh-2.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "feh-2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://feh.finalrewind.org/feh-2.4.tar.bz2;
|
||||
sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48";
|
||||
url = "http://feh.finalrewind.org/${name}.tar.bz2";
|
||||
sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx";
|
||||
};
|
||||
|
||||
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
Index: src/3rdParty/salomesmesh/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy)
|
||||
@@ -191,7 +191,7 @@
|
||||
INCLUDE_DIRECTORIES(src/StdMeshers)
|
||||
|
||||
ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files})
|
||||
-TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c)
|
||||
+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran)
|
||||
SET(StdMeshers_CFLAGS "")
|
||||
IF(WIN32)
|
||||
SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS")
|
||||
@@ -218,9 +218,9 @@
|
||||
# Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
|
||||
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
|
||||
SMESHDS SMESH StdMeshers
|
||||
- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
|
||||
+ DESTINATION lib)
|
||||
# Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
|
||||
INSTALL(DIRECTORY inc/
|
||||
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
|
||||
+ DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h*")
|
||||
ENDIF(UNIX)
|
||||
Index: src/3rdParty/Pivy-0.5/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy)
|
||||
@@ -56,6 +56,7 @@
|
||||
set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
|
||||
set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
|
||||
set_target_properties(coin PROPERTIES PREFIX "")
|
||||
+ install(TARGETS coin DESTINATION bin/pivy)
|
||||
endif(MSVC)
|
||||
|
||||
fc_copy_sources_outpath("bin/pivy" "coin"
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/CMakeLists.txt (revision 4193)
|
||||
+++ a/CMakeLists.txt (working copy)
|
||||
@@ -57,13 +57,6 @@
|
||||
|
||||
# ================================================================================
|
||||
|
||||
-
|
||||
-if(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
|
||||
-else(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
|
||||
-endif(WIN32)
|
||||
-
|
||||
# ================================================================================
|
||||
# == Win32 is default behaviour use the LibPack copied in Source tree ============
|
||||
if(MSVC)
|
||||
|
|
@ -1,17 +1,15 @@
|
|||
{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
|
||||
{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
|
||||
boost, zlib,
|
||||
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
|
||||
|
||||
# It builds but fails to install
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freecad-${version}";
|
||||
version = "svn-${src.rev}";
|
||||
version = "git-20121213";
|
||||
|
||||
src = fetchsvn {
|
||||
url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk;
|
||||
rev = "4184";
|
||||
sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce";
|
||||
src = fetchgit {
|
||||
url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad;
|
||||
rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f";
|
||||
sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
|
||||
|
|
@ -19,12 +17,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# The freecad people are used to boost 1.42, and we have newer boost that
|
||||
# require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build
|
||||
# For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE,
|
||||
# we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work.
|
||||
NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64";
|
||||
|
||||
# This should work on both x86_64, and i686 linux
|
||||
preBuild = ''
|
||||
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
|
||||
|
|
@ -35,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
|
||||
'';
|
||||
|
||||
patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
|
||||
patches = [ ./pythonpath.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = http://free-cad.sourceforge.net/;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
|
||||
|
||||
Index: src/Main/MainGui.cpp
|
||||
===================================================================
|
||||
--- a/src/Main/MainGui.cpp (revision 4193)
|
||||
+++ a/src/Main/MainGui.cpp (working copy)
|
||||
@@ -149,10 +149,10 @@
|
||||
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
|
||||
index 03407c5..b029384 100644
|
||||
--- a/src/Main/MainGui.cpp
|
||||
+++ b/src/Main/MainGui.cpp
|
||||
@@ -190,15 +190,15 @@ int main( int argc, char ** argv )
|
||||
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
|
||||
putenv("LANG=C");
|
||||
putenv("LC_ALL=C");
|
||||
- putenv("PYTHONPATH=");
|
||||
+ //putenv("PYTHONPATH=");
|
||||
#elif defined(FC_OS_MACOSX)
|
||||
(void)QLocale::system();
|
||||
putenv("LANG=C");
|
||||
putenv("LC_ALL=C");
|
||||
- putenv("PYTHONPATH=");
|
||||
+ //putenv("PYTHONPATH=");
|
||||
#else
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, intltool, gettext, libchamplain_0_6, fbida }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geeqie-1.0";
|
||||
name = "geeqie-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/geeqie/${name}.tar.gz";
|
||||
sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
|
||||
sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gimp-2.8.0";
|
||||
name = "gimp-2.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
|
||||
md5 = "28997d14055f15db063eb92e1c8a7ebb";
|
||||
md5 = "b542138820ca3a41cbd63fc331907955";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
libLQR = pluginDerivation {
|
||||
name = "liblqr-1-0.4.1";
|
||||
# required by lqrPlugin, you don't havet to install this lib explicitely
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
|
||||
sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
|
||||
|
|
@ -50,7 +50,7 @@ rec {
|
|||
Video
|
||||
*/
|
||||
name = "gap-2.6.0";
|
||||
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
|
||||
sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
|
||||
|
|
@ -74,7 +74,7 @@ rec {
|
|||
Filters/Generic/FFT Inverse
|
||||
*/
|
||||
name = "fourier-0.3.3";
|
||||
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs;
|
||||
postInstall = "fail";
|
||||
installPhase = "installPlugins fourier";
|
||||
src = fetchurl {
|
||||
|
|
@ -91,7 +91,7 @@ rec {
|
|||
Filters/Enhance/Smart remove selection
|
||||
*/
|
||||
name = "resynthesizer-0.16";
|
||||
buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz;
|
||||
sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x";
|
||||
|
|
@ -105,7 +105,7 @@ rec {
|
|||
|
||||
texturize = pluginDerivation {
|
||||
name = "texturize-2.1";
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz;
|
||||
sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3";
|
||||
|
|
@ -118,7 +118,7 @@ rec {
|
|||
Filters/Enhance/Wavelet sharpen
|
||||
*/
|
||||
name = "wavelet-sharpen-0.1.2";
|
||||
buildInputs = [ gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz;
|
||||
sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw";
|
||||
|
|
@ -131,7 +131,7 @@ rec {
|
|||
Layer/Liquid Rescale
|
||||
*/
|
||||
name = "lqr-plugin-0.6.1";
|
||||
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
|
||||
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
|
||||
|
|
@ -146,7 +146,7 @@ rec {
|
|||
let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
|
||||
in pluginDerivation {
|
||||
name = "gmic-1.3.2.0";
|
||||
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
|
||||
src = fetchurl {
|
||||
url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz;
|
||||
sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h";
|
||||
|
|
@ -172,7 +172,7 @@ rec {
|
|||
# or use the binary
|
||||
ufraw = pluginDerivation {
|
||||
name = "ufraw-0.15";
|
||||
buildInputs = [pkgs.lcms gimp] ++ gimp.buildNativeInputs;
|
||||
buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs;
|
||||
# --enable-mime - install mime files, see README for more information
|
||||
# --enable-extras - build extra (dcraw, nikon-curve) executables
|
||||
# --enable-dst-correction - enable DST correction for file timestamps.
|
||||
|
|
|
|||
|
|
@ -1,14 +1,23 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, tk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gocr-0.44";
|
||||
name = "gocr-0.49";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
|
||||
sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
|
||||
url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
|
||||
sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://jocr.sourceforge.net/";
|
||||
description = "GPL Optical Character Recognition";
|
||||
license = "GPLv2";
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
zlib libtool
|
||||
];
|
||||
|
||||
buildNativeInputs = [ xz ];
|
||||
nativeBuildInputs = [ xz ];
|
||||
|
||||
postInstall = ''
|
||||
sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap
|
||||
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
|
||||
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "inkscape-0.48.2";
|
||||
name = "inkscape-0.48.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
|
||||
sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
|
||||
sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
|
||||
};
|
||||
|
||||
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
|
||||
patches = [ ./configure-python-libs.patch ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# Python is used at run-time to execute scripts, e.g., those from
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
|
||||
, makeWrapper }:
|
||||
let ghostscript = ghostscriptX; in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipe-7.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
|
||||
sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
|
||||
};
|
||||
|
||||
# changes taken from Gentoo portage
|
||||
preConfigure = ''
|
||||
cd src
|
||||
sed -i \
|
||||
-e 's/fpic/fPIC/' \
|
||||
-e 's/moc-qt4/moc/' \
|
||||
config.mak || die
|
||||
sed -i -e 's/install -s/install/' common.mak || die
|
||||
'';
|
||||
|
||||
IPEPREFIX="$$out";
|
||||
URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram "$prog" --prefix PATH : "${texLive}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
#TODO: make .desktop entry
|
||||
|
||||
meta = {
|
||||
description = "An editor for drawing figures";
|
||||
homepage = http://ipe7.sourceforge.net;
|
||||
license = "GPLv3+";
|
||||
longDescription = ''
|
||||
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
|
||||
It supports making small figures for inclusion into LaTeX-documents
|
||||
as well as presentations in PDF.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
|
||||
];
|
||||
|
||||
buildNativeInputs = [ pkgconfig cmake automoc4 ];
|
||||
nativeBuildInputs = [ pkgconfig cmake automoc4 ];
|
||||
|
||||
meta = {
|
||||
description = "Photo Management Program";
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
patchPhase=patchPhase
|
||||
patchPhase() {
|
||||
sed -e "s@-ljpeg6b@-ljpeg@" -i configure
|
||||
}
|
||||
|
||||
genericBuild
|
||||
|
||||
ln -sv $KDEDIR/share/mimelnk $out/share
|
||||
|
|
@ -10,5 +10,5 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ kdelibs imlib ];
|
||||
|
||||
buildNativeInputs = [ cmake gettext pkgconfig ];
|
||||
nativeBuildInputs = [ cmake gettext pkgconfig ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
|
||||
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "meshlab-1.2.3a";
|
||||
name = "meshlab-1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz;
|
||||
sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v";
|
||||
url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz";
|
||||
sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1";
|
||||
};
|
||||
|
||||
# I don't know why I need this; without this, the rpath set at the beginning of the
|
||||
|
|
@ -13,13 +13,16 @@ stdenv.mkDerivation rec {
|
|||
dontPatchELF = true;
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p "$out/include"
|
||||
cp -r vcglib "$out/include"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib"
|
||||
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
|
||||
cd meshlab/src
|
||||
pushd external
|
||||
qmake -recursive external.pro
|
||||
make
|
||||
popd
|
||||
qmake -recursive meshlabv12.pro
|
||||
qmake -recursive meshlab_full.pro
|
||||
make
|
||||
'';
|
||||
|
||||
|
|
@ -31,7 +34,9 @@ stdenv.mkDerivation rec {
|
|||
ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
|
||||
'';
|
||||
|
||||
buildInputs = [ qt unzip ];
|
||||
sourceRoot = ".";
|
||||
|
||||
buildInputs = [ qt4 unzip ];
|
||||
|
||||
meta = {
|
||||
description = "System for the processing and editing of unstructured 3D triangular meshes";
|
||||
|
|
|
|||
|
|
@ -1,19 +1,24 @@
|
|||
{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
|
||||
{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
|
||||
, mpfr, gmp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2011.12";
|
||||
version = "git-20121213";
|
||||
name = "openscad-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
|
||||
sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
|
||||
# src = fetchurl {
|
||||
# url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
|
||||
# sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
|
||||
# };
|
||||
src = fetchgit {
|
||||
url = "https://github.com/openscad/openscad.git";
|
||||
rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
|
||||
sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
|
||||
};
|
||||
|
||||
buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
|
||||
|
||||
configurePhase = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 "
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
|
||||
qmake PREFIX="$out"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "pqiv-0.8";
|
||||
name = "pqiv-0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/${name}.tbz";
|
||||
sha256 = "365332bab4b13ca56da6935e7155af20658e67d323808942dce23e880466f66d";
|
||||
url = "https://github.com/downloads/phillipberndt/pqiv/${name}.tbz";
|
||||
sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e";
|
||||
};
|
||||
|
||||
buildInputs = [ getopt which pkgconfig gtk ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "qiv-2.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://spiegl.de/qiv/download/${name}.tgz";
|
||||
sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk imlib2 file ];
|
||||
|
||||
preBuild=''
|
||||
substituteInPlace Makefile --replace /usr/local "$out"
|
||||
substituteInPlace Makefile --replace /man/ /share/man/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "qiv (quick image viewer)";
|
||||
homepage = http://spiegl.de/qiv/;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
||||
, libXdmcp, lcms2, libiptcdata
|
||||
, libXdmcp, lcms2, libiptcdata, expat
|
||||
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
|
||||
}:
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
||||
lcms2 libiptcdata mercurial ];
|
||||
lcms2 libiptcdata expat mercurial ];
|
||||
|
||||
# Disable the use of the RAWZOR propietary libraries
|
||||
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue