Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
ac8775dd96
$xcodePath -> $SDKROOT
...
SDKROOT is standard. In particular, this fixes the cmake build on
Mac OS X 10.9.
2014-07-24 21:53:46 +02:00
Eelco Dolstra
eb6c0826c5
libsamplerate: Use default gcc
2014-07-23 11:45:44 +02:00
Nixpkgs Monitor
b9964865fe
libsamplerate: update from 0.1.7 to 0.1.8
2013-12-18 18:18:36 +02:00
Eelco Dolstra
10cb4a8cf2
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libsndfile/default.nix
pkgs/misc/cups/default.nix
pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
Shea Levy
3b274caaac
Fix tarball
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 15:54:39 -04:00
Jason \"Don\" O'Conal
3a1a7b2d6a
libsamplerate: fix build on darwin
...
* build with gccApple
* add Carbon include path
2013-07-12 16:26:45 +02:00
Eelco Dolstra
3a35ba350f
Turn multipleOutputs into a stdenv adaptation
...
This way we can merge it into stdenv.mkDerivation later without having
to modify any package expressions (except the overrides in
all-packages.nix).
2012-08-24 20:43:48 -04:00
Eelco Dolstra
681d659ee4
libsamplerate: Drop dependency on fftw
...
It's only used for examples/tests, so not much point in depending on
it.
2012-08-24 17:29:26 -04:00
Eelco Dolstra
53661fda0b
Strip/patchelf the bin output
2012-08-23 16:21:45 -04:00
Peter Simons
1e7ef9e33f
pkgs/development/libraries/libsamplerate: fixed the sha256 hash of the release tarball
...
svn path=/nixpkgs/trunk/; revision=24421
2010-10-22 15:04:26 +00:00
Yury G. Kudryashov
65f0b956a2
Add libsndfile and fftw support to libsamplerate
...
svn path=/nixpkgs/trunk/; revision=22831
2010-07-30 20:17:37 +00:00
Eelco Dolstra
6609710409
* Get rid of many instances of "args: with args;", and other coding
...
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Eelco Dolstra
d3f5d94ac7
* Fix some attributes that now make nix-env -q --meta barf.
...
svn path=/nixpkgs/trunk/; revision=16134
2009-07-02 09:08:01 +00:00
Marc Weber
e996113be7
removed mkDerivationByConfiguration, using composableDerivation instead
...
qgis, vim_configurable both work now
svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Michael Raskin
41ecc6941b
svn path=/nixpkgs/trunk/; revision=9861
2007-12-04 22:06:13 +00:00
Marc Weber
e87c6a6793
sox, ffmpeg_svn expressions added
...
ghcPkgUtil defines a function to create setup-hook
- creating a packagedatabase (nix-support/package.conf)
- adding it to GHC_PACKAGE_PATH
see comments for details
svn path=/nixpkgs/trunk/; revision=9500
2007-10-22 00:51:40 +00:00
