ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

treewide: fix missing libs after libtool pruning #51767

Browse Source
This commit is contained in:
Vladimír Čunát 2019-02-10 14:14:33 +01:00
parent 7455889641
commit 64edccb463
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
6 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/jamin/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation {
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
++ (with perlPackages; [ perl XMLParser ]); ++ (with perlPackages; [ perl XMLParser ]);
NIX_LDFLAGS = [ "-ldl" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
''; '';

2
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
View File

@ -15,4 +15,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ]; buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
NIX_LDFLAGS = [ "-lgthread-2.0" ];
} }

2
pkgs/development/libraries/spatialite-tools/default.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_LDFLAGS = [ "-lsqlite3" ];
meta = { meta = {
description = "A complete sqlite3-compatible CLI front-end for libspatialite"; description = "A complete sqlite3-compatible CLI front-end for libspatialite";
homepage = https://www.gaia-gis.it/fossil/spatialite-tools; homepage = https://www.gaia-gis.it/fossil/spatialite-tools;

6
pkgs/development/tools/misc/hydra/default.nix
View File

@ -87,7 +87,7 @@ in releaseTools.nixBuild rec {
}; };
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl nix perlDeps perl nix
@ -100,7 +100,7 @@ in releaseTools.nixBuild rec {
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
# adds a patch which ensures compatibility with the API of Nix 2.0. # adds a patch which ensures compatibility with the API of Nix 2.0.
# it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44, # it has been reverted in https://github.com/NixOS/hydra/commit/162d671c48a418bd10a8a171ca36787ef3695a44,
@ -114,6 +114,8 @@ in releaseTools.nixBuild rec {
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = [ "-pthread" ];
shellHook = '' shellHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
PERL5LIB=$(pwd)/src/lib:$PERL5LIB; PERL5LIB=$(pwd)/src/lib:$PERL5LIB;

2
pkgs/games/exult/default.nix
View File

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=$(out)" ]; makeFlags = [ "DESTDIR=$(out)" ];
NIX_LDFLAGS = [ "-lX11" ];
postInstall = postInstall =
'' ''
mkdir -p $out/share/exult/music mkdir -p $out/share/exult/music

2
pkgs/games/macopix/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
NIX_LDFLAGS = [ "-lX11" ];
meta = { meta = {
description = "Mascot Constructive Pilot for X"; description = "Mascot Constructive Pilot for X";
homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html;