diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
| commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
| tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/development/interpreters | |
| parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
| parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
| download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip | |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/dart/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index f51ac1cdddf1..dd0d0e94482c 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; }; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch index 2bf1841e9dd2..1382de70625e 100644 --- a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch +++ b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch @@ -4,7 +4,7 @@ : who configured the system cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -+cf_time='Thu Jan 1 00:00:00 UTC 1970' ++cf_time='Thu Jan 1 00:00:01 UTC 1970' + case "$cf_by" in "") |