Commit graph

14497 commits

Author SHA1 Message Date
Eelco Dolstra 0cb6cfb7a1 * Update vlc to 1.1.11.
svn path=/nixpkgs/branches/kde-4.7/; revision=28104
2011-08-01 09:23:10 +00:00
Eelco Dolstra 99ff06be3e * KDE 4.5 needs an older version of shared-desktop-ontologies.
svn path=/nixpkgs/branches/kde-4.7/; revision=28103
2011-08-01 09:08:57 +00:00
Eelco Dolstra 08b9b370a4 * KDE 4.5: use an old ffmpeg.
svn path=/nixpkgs/branches/kde-4.7/; revision=28102
2011-08-01 08:32:20 +00:00
Shea Levy 6a74987ad4 openjdk: Fix mistakenly erased square bracket
Not sure how that happend...

svn path=/nixpkgs/trunk/; revision=28100
2011-08-01 02:59:22 +00:00
Shea Levy 84529a1370 openjdk: Add meta attributes
svn path=/nixpkgs/trunk/; revision=28099
2011-08-01 01:17:42 +00:00
Shea Levy 31b09ab695 openjdk: Install build results to $out
svn path=/nixpkgs/trunk/; revision=28098
2011-08-01 01:17:33 +00:00
Shea Levy 572edb6f68 openjdk: Add patch to fix 'printf: --: invalid option' error
Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix

svn path=/nixpkgs/trunk/; revision=28097
2011-08-01 01:17:25 +00:00
Shea Levy 43cb8fb149 openjdk: Add cpio to buildInputs
svn path=/nixpkgs/trunk/; revision=28096
2011-08-01 01:17:16 +00:00
Shea Levy ec41a120fb openjdk: Add patch to avoid an empty -I flag
svn path=/nixpkgs/trunk/; revision=28095
2011-08-01 01:17:08 +00:00
Shea Levy 0e9cda68fc openjdk: Fix an Xrender.h include
svn path=/nixpkgs/trunk/; revision=28094
2011-08-01 01:16:59 +00:00
Shea Levy c6cf3e563e Add libXi to buildInputs
svn path=/nixpkgs/trunk/; revision=28093
2011-08-01 01:16:50 +00:00
Shea Levy 09567b5caf Add libXtst to buildInputs
svn path=/nixpkgs/trunk/; revision=28092
2011-08-01 01:16:42 +00:00
Shea Levy e2f7b2087c Add libXrender to buildInputs
svn path=/nixpkgs/trunk/; revision=28091
2011-08-01 01:16:35 +00:00
Shea Levy fb896f62dd Add libXext to buildInputs
svn path=/nixpkgs/trunk/; revision=28090
2011-08-01 01:16:27 +00:00
Shea Levy 6ce3f32da2 Add libXt to buildInputs
svn path=/nixpkgs/trunk/; revision=28089
2011-08-01 01:16:19 +00:00
Shea Levy 2e0252011d Add libX11 to buildInputs
svn path=/nixpkgs/trunk/; revision=28088
2011-08-01 01:16:10 +00:00
Shea Levy 9e06eb71d6 Add alsaLib to buildInputs
svn path=/nixpkgs/trunk/; revision=28087
2011-08-01 01:16:02 +00:00
Shea Levy e052a36daf openjdk: Use the /bin/echo sed on the corba makefiles too
svn path=/nixpkgs/trunk/; revision=28086
2011-08-01 01:15:53 +00:00
Shea Levy 635dd9aac5 openjdk: Combine two seds into one
svn path=/nixpkgs/trunk/; revision=28085
2011-08-01 01:15:45 +00:00
Shea Levy f70d3b72df openjdk: We need ECHO to be echo -e, so replace the override with a sed
svn path=/nixpkgs/trunk/; revision=28084
2011-08-01 01:15:37 +00:00
Shea Levy 5fca670490 openjdk: Use makeFlags properly
svn path=/nixpkgs/trunk/; revision=28083
2011-08-01 01:15:29 +00:00
Shea Levy 58d64db27d openjdk: Override hardcoded sort. It doesn't use any of the _PATH variables on linux
svn path=/nixpkgs/trunk/; revision=28082
2011-08-01 01:15:21 +00:00
Shea Levy 465a320b20 openjdk: Remove unneeded explicit dependencies
svn path=/nixpkgs/trunk/; revision=28081
2011-08-01 01:15:13 +00:00
Shea Levy d0fe9fa2e8 openjdk: Remove all hardcoded binary overrides except echo
svn path=/nixpkgs/trunk/; revision=28080
2011-08-01 01:15:05 +00:00
Shea Levy a0022251d9 openjdk: Override hardcoded echo again. It doesn't use any of the _PATH variables on linux
svn path=/nixpkgs/trunk/; revision=28079
2011-08-01 01:14:57 +00:00
Shea Levy cdc12ac64a openjdk: Add nettools to buildInputs
svn path=/nixpkgs/trunk/; revision=28078
2011-08-01 01:14:49 +00:00
Shea Levy 29c72c4499 openjdk: Override UNIXCOMMAND_PATH so those binaries are found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
svn path=/nixpkgs/trunk/; revision=28077
2011-08-01 01:14:41 +00:00
Shea Levy 0f257e1d5d openjdk: Remove all coreutils overrides so they can be found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
svn path=/nixpkgs/trunk/; revision=28076
2011-08-01 01:14:33 +00:00
Shea Levy 693dc6536b openjdk: Replace dummy paths with empty path so the build uses the binaries in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
svn path=/nixpkgs/trunk/; revision=28075
2011-08-01 01:14:25 +00:00
Shea Levy 49be6e4ed6 openjdk: Override hardcode to ln
svn path=/nixpkgs/trunk/; revision=28074
2011-08-01 01:14:17 +00:00
Shea Levy b65c19f18b openjdk: Override hardcode to readelf
svn path=/nixpkgs/trunk/; revision=28073
2011-08-01 01:14:09 +00:00
Shea Levy 8cf5de2fd4 openjdk: Override hardcodes to nm and ldd
svn path=/nixpkgs/trunk/; revision=28072
2011-08-01 01:14:00 +00:00
Shea Levy dff2d2b06f openjdk: Override hardcode to mv
svn path=/nixpkgs/trunk/; revision=28071
2011-08-01 01:13:52 +00:00
Shea Levy 1eb55ce743 openjdk: Fix hardcode to /bin/ls
svn path=/nixpkgs/trunk/; revision=28070
2011-08-01 01:13:44 +00:00
Shea Levy ddd7cc3fd2 openjdk: Fix hardcode to /usr/bin/test
svn path=/nixpkgs/trunk/; revision=28069
2011-08-01 01:13:36 +00:00
Shea Levy 0603a5d356 openjdk: Allow downloads of source 'drops' during build
svn path=/nixpkgs/trunk/; revision=28068
2011-08-01 01:13:27 +00:00
Shea Levy 482daa3afd openjdk: Add zip to buildInputs
svn path=/nixpkgs/trunk/; revision=28067
2011-08-01 01:13:19 +00:00
Shea Levy 2731048017 openjdk: Override hardcoded chmod
svn path=/nixpkgs/trunk/; revision=28066
2011-08-01 01:13:11 +00:00
Shea Levy b722db6adb openjdk: Override hardcoded cp
svn path=/nixpkgs/trunk/; revision=28065
2011-08-01 01:13:02 +00:00
Shea Levy 735366584a openjdk: Override hardcoded touch
svn path=/nixpkgs/trunk/; revision=28064
2011-08-01 01:12:54 +00:00
Shea Levy 5054c8e8bb openjdk: Override hardcoded find
svn path=/nixpkgs/trunk/; revision=28063
2011-08-01 01:12:44 +00:00
Shea Levy 40d1bd9950 openjdk: Replace substitutions with env vars
svn path=/nixpkgs/trunk/; revision=28062
2011-08-01 01:12:36 +00:00
Shea Levy b1b5b09557 openjdk: Add bootstrap JDK
svn path=/nixpkgs/trunk/; revision=28061
2011-08-01 01:12:28 +00:00
Shea Levy 75918e6537 openjdk: add 'which' to buildInputs
svn path=/nixpkgs/trunk/; revision=28060
2011-08-01 01:12:19 +00:00
Shea Levy 82d11e742c openjdk: Override hardcoded printf
svn path=/nixpkgs/trunk/; revision=28059
2011-08-01 01:12:12 +00:00
Shea Levy 706a7ff59d openjdk: Override hardcoded gawk
svn path=/nixpkgs/trunk/; revision=28058
2011-08-01 01:12:04 +00:00
Shea Levy 374eb5688e openjdk: Set dummy /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec variables
svn path=/nixpkgs/trunk/; revision=28057
2011-08-01 01:11:56 +00:00
Shea Levy a156ccd763 openjdk: Fix ALSA_INCLUDE variable
svn path=/nixpkgs/trunk/; revision=28056
2011-08-01 01:11:48 +00:00
Shea Levy ac6fb72ab1 openjdk: Override hardcoded cups headers path
svn path=/nixpkgs/trunk/; revision=28055
2011-08-01 01:11:40 +00:00
Shea Levy fa80adbe2a openjdk: Use proper milestone and build_number strings
svn path=/nixpkgs/trunk/; revision=28054
2011-08-01 01:11:32 +00:00
Shea Levy 08fe49fbb4 openjdk: Override hardcoded cat
svn path=/nixpkgs/trunk/; revision=28053
2011-08-01 01:11:24 +00:00
Shea Levy ed9837c37c openjdk: Override hardcoded freetype library path
svn path=/nixpkgs/trunk/; revision=28052
2011-08-01 01:11:17 +00:00
Shea Levy d5eec4cd11 openjdk: Override hardcoded freetype headers
svn path=/nixpkgs/trunk/; revision=28051
2011-08-01 01:11:09 +00:00
Shea Levy 6e06060c33 zip: Make it actually install something
svn path=/nixpkgs/trunk/; revision=28050
2011-08-01 01:11:01 +00:00
Shea Levy 3a74fd3f3b zip: Bump to 3.0
svn path=/nixpkgs/trunk/; revision=28049
2011-08-01 01:10:52 +00:00
Shea Levy 92e792f17b zip: Change formatting
svn path=/nixpkgs/trunk/; revision=28048
2011-08-01 01:10:44 +00:00
Shea Levy 6a34912bfb zip: Folded builder into derivation
svn path=/nixpkgs/trunk/; revision=28047
2011-08-01 01:10:36 +00:00
Shea Levy 38c1179f56 openjdk: Override hardcoded zip
svn path=/nixpkgs/trunk/; revision=28046
2011-08-01 01:10:28 +00:00
Shea Levy 6795da6837 Rearrange program inputs
svn path=/nixpkgs/trunk/; revision=28045
2011-08-01 01:10:16 +00:00
Shea Levy 52582a9b45 openjdk: Add ant to buildInputs
svn path=/nixpkgs/trunk/; revision=28044
2011-08-01 01:10:08 +00:00
Shea Levy 17c2fb730e openjdk: Override hardcoded head
svn path=/nixpkgs/trunk/; revision=28043
2011-08-01 01:10:01 +00:00
Shea Levy 27112e7233 openjdk: Override hardcoded alsa headers
svn path=/nixpkgs/trunk/; revision=28042
2011-08-01 01:09:53 +00:00
Shea Levy e3ebf2024a openjdk: Fix hardcoded sed
svn path=/nixpkgs/trunk/; revision=28041
2011-08-01 01:09:45 +00:00
Shea Levy 0734d0315e openjdk: Override hardcoded egrep
svn path=/nixpkgs/trunk/; revision=28040
2011-08-01 01:09:38 +00:00
Shea Levy 8286d4df8d openjdk: Override hardcoded tr
svn path=/nixpkgs/trunk/; revision=28039
2011-08-01 01:09:30 +00:00
Shea Levy 027595d6b0 openjdk: Override hardcoded pwd
svn path=/nixpkgs/trunk/; revision=28038
2011-08-01 01:09:22 +00:00
Shea Levy 39bea03827 openjdk: Override hardcoded date
svn path=/nixpkgs/trunk/; revision=28037
2011-08-01 01:09:14 +00:00
Shea Levy eceec04a44 openjdk: Override hardcoded grep
svn path=/nixpkgs/trunk/; revision=28036
2011-08-01 01:09:06 +00:00
Shea Levy b3ab977d90 openjdk: Factor path overrides out into makeFlags
svn path=/nixpkgs/trunk/; revision=28035
2011-08-01 01:08:58 +00:00
Shea Levy 146d6875b3 openjdk: Fix hardcoded gcc
svn path=/nixpkgs/trunk/; revision=28034
2011-08-01 01:08:49 +00:00
Shea Levy 057e36e2f7 openjdk: Override hard-coded mkdir
svn path=/nixpkgs/trunk/; revision=28033
2011-08-01 01:08:40 +00:00
Shea Levy 3439ac32bf openjdk: Fix some formatting
svn path=/nixpkgs/trunk/; revision=28032
2011-08-01 01:08:32 +00:00
Shea Levy d46390e7d2 openjdk: Add sanity check
svn path=/nixpkgs/trunk/; revision=28031
2011-08-01 01:08:23 +00:00
Shea Levy 686476b7bb openjdk: Fix hard-code to echo
svn path=/nixpkgs/trunk/; revision=28030
2011-08-01 01:08:15 +00:00
Shea Levy 11f0ca9320 openjdk: Add 'free' to $PATH for the build
svn path=/nixpkgs/trunk/; revision=28029
2011-08-01 01:08:07 +00:00
Shea Levy 23e378a3c4 *openjdk: Get source to unpack
svn path=/nixpkgs/trunk/; revision=28028
2011-08-01 01:07:58 +00:00
Shea Levy 7a3e4c40ec Add openjdk to all-packages.nix
svn path=/nixpkgs/trunk/; revision=28027
2011-08-01 01:07:47 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Eelco Dolstra 483bedccda * Disable kdebindings in the old KDE 4.5. It doesn't build anymore
due to changes in Phonon and other packages.  It's not really
  important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
2011-07-31 19:12:10 +00:00
Peter Simons fc5ea05cfd Keep polyparse 1.4 around because haskell-graphviz depends on the older version.
I've asked upstream to update their cabal file, but until then we'll
need both versions. :-(

svn path=/nixpkgs/trunk/; revision=28021
2011-07-31 15:33:55 +00:00
Cillian de Roiste 5e6506c4d0 Updating the development ardour3 revision, also renaming so that ardour2 and ardour3 can peacefully co-exist
svn path=/nixpkgs/trunk/; revision=28020
2011-07-31 14:52:42 +00:00
Cillian de Roiste 5231ba050f Updating qtractor to the latest release: 0.5.0
svn path=/nixpkgs/trunk/; revision=28019
2011-07-31 14:04:45 +00:00
Cillian de Roiste 492935270b Adding new required inputs for darktable
svn path=/nixpkgs/trunk/; revision=28018
2011-07-31 11:11:52 +00:00
Cillian de Roiste 1d22700866 Removing exif patch, no longer needed
svn path=/nixpkgs/trunk/; revision=28017
2011-07-31 10:50:06 +00:00
Cillian de Roiste 53b9044b19 Updating darktable to 0.9.1
svn path=/nixpkgs/trunk/; revision=28016
2011-07-31 10:49:19 +00:00
Cillian de Roiste 4cc923b4bb Fixing the download url
svn path=/nixpkgs/trunk/; revision=28015
2011-07-31 08:56:09 +00:00
Cillian de Roiste 0942a5b164 Updating node to 0.5.2
svn path=/nixpkgs/trunk/; revision=28014
2011-07-31 08:49:03 +00:00
Peter Simons 10f65d1148 HaXml: added version 1.22.2
It's not the default, though, because it breaks API compatibility
with earlier versions.

svn path=/nixpkgs/trunk/; revision=28013
2011-07-30 21:43:47 +00:00
Peter Simons 4aca0cf217 haskell-polyparse: updated to version 1.7
svn path=/nixpkgs/trunk/; revision=28012
2011-07-30 21:43:39 +00:00
Cillian de Roiste e1c2108085 Add dbus support to qjackctl so that it can use jackdbus
svn path=/nixpkgs/trunk/; revision=28011
2011-07-30 21:06:45 +00:00
Cillian de Roiste 415be547b3 Enabling optional jackaudio support for pulseaudio
svn path=/nixpkgs/trunk/; revision=28010
2011-07-30 18:51:42 +00:00
Eelco Dolstra 35437ef75b * Updated kdepim-runtime and kdepim.
svn path=/nixpkgs/branches/kde-4.7/; revision=28008
2011-07-29 19:05:52 +00:00
Eelco Dolstra 980b453102 * Fix localisation.
svn path=/nixpkgs/branches/kde-4.7/; revision=28007
2011-07-29 17:48:39 +00:00
Eelco Dolstra 76fffef175 * More stuff.
svn path=/nixpkgs/branches/kde-4.7/; revision=28006
2011-07-29 17:24:59 +00:00
Eelco Dolstra aee4ccdee0 * Updated kdeartwork.
svn path=/nixpkgs/branches/kde-4.7/; revision=28005
2011-07-29 16:09:55 +00:00
Eelco Dolstra f966079e30 * Eigen updated to 2.0.16
svn path=/nixpkgs/branches/kde-4.7/; revision=28004
2011-07-29 16:05:25 +00:00
Eelco Dolstra 8099c514f9 * Xscreensaver updated to 5.14.
svn path=/nixpkgs/branches/kde-4.7/; revision=28003
2011-07-29 16:04:44 +00:00
Eelco Dolstra d3df8a3085 * Updated kdeaccessibility.
svn path=/nixpkgs/branches/kde-4.7/; revision=28001
2011-07-29 14:30:07 +00:00
Eelco Dolstra 2d4c4ae1bd * Updated kdewebdev.
svn path=/nixpkgs/branches/kde-4.7/; revision=28000
2011-07-29 14:16:12 +00:00
Eelco Dolstra 9650b1283e * Updated kdesdk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27999
2011-07-29 13:50:53 +00:00