diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-25 11:33:05 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-25 11:33:05 +0200 |
| commit | bbc1df309200d071b6f368e65de2ccbf4b392fdd (patch) | |
| tree | 0676debbe7be5355ac1b3d19ff2a68d66b3639d1 /pkgs/development | |
| parent | 44660d7b907a0b09f507a733a8bd6a80cdab66d0 (diff) | |
| parent | f83d12a382c15caaf2486f6cb0d288881f459097 (diff) | |
| download | nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar.gz nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar.bz2 nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar.lz nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar.xz nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.tar.zst nixlib-bbc1df309200d071b6f368e65de2ccbf4b392fdd.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glibc/nix-locale-archive.patch | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index 88c8adef9226..eeaf21901a39 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -6,7 +6,7 @@ diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive. +static int -+open_locale_archive () ++open_locale_archive (void) +{ + int fd = -1; + char *path = getenv ("LOCALE_ARCHIVE_2_11"); diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 43fca875f58f..4409dfc4eca7 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -85,16 +85,16 @@ stdenv.mkDerivation rec { libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')" for lib in $libs; do if [ -e "$out/lib/lib''${lib}w.so" ]; then - echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so + ln -svf lib''${lib}w.so $out/lib/lib$lib.so + ln -svf lib''${lib}w.so.${abiVersion} $out/lib/lib$lib.so.${abiVersion} fi ln -svf lib''${lib}w.a $out/lib/lib$lib.a ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc done # Create curses compatability - echo "INPUT(-lncursesw)" > $out/lib/libcursesw.so - echo "INPUT(-lncursesw)" > $out/lib/libcurses.so - ln -svf libncurses + ln -svf libncursesw.so $out/lib/libcursesw.so + ln -svf libncursesw.so $out/lib/libcurses.so '' else '' # Create a non-abi versioned config cfg=$(basename $out/bin/ncurses*-config) @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ln -svf . $out/include/ncurses # Create curses compatability - echo "INPUT(-lncurses)" > $out/lib/libcurses.so + ln -svf libncurses.so $out/lib/libcurses.so ''; meta = { |