diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-07 16:42:39 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-07 16:42:39 +0200 |
| commit | 16510869eb6eaa711ba9cab46b9cd3430c8bdb7f (patch) | |
| tree | ca7971360f64a67d1726a2241f2d28b44e07fcad /pkgs/games | |
| parent | 72acb24c1fd4ddb2c9eb765d4b19f8ac19562ff4 (diff) | |
| parent | 3d8f9a6937be5295aa3cba714c807f75b748bd93 (diff) | |
| download | nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar.gz nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar.bz2 nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar.lz nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar.xz nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.tar.zst nixlib-16510869eb6eaa711ba9cab46b9cd3430c8bdb7f.zip | |
Merge pull request #15278 from Baughn/ckan
ckan: Add curl to runtime libraries
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/ckan/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 1465a65a2bd9..1d151b66920a 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk, curl }: stdenv.mkDerivation rec { name = "ckan-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0lfvl8w09lakz35szp5grfvhq8xx486f5igvj1m6azsql4n929lg"; }; - buildInputs = [ makeWrapper perl mono gtk ]; + buildInputs = [ makeWrapper perl mono ]; postPatch = '' substituteInPlace bin/build \ @@ -22,13 +22,15 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; + libraries = stdenv.lib.makeLibraryPath [ gtk curl ]; + installPhase = '' mkdir -p $out/bin for exe in *.exe; do install -m 0644 $exe $out/bin makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \ --add-flags $out/bin/$exe \ - --set LD_LIBRARY_PATH ${gtk.out}/lib + --set LD_LIBRARY_PATH $libraries done ''; |