public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libX11 is not in vice's rpath. this fixes it

Browse Source
This commit is contained in:
Sander van der Burg 2013-09-04 22:34:08 +02:00
parent 6eb240ed24
commit 1642e3a6d7
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/emulators/vice/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa { stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem , pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
}: }:
@ -28,15 +28,20 @@ stdenv.mkDerivation rec {
autoreconf -f -i autoreconf -f -i
''; '';
NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
postInstall = '' postInstall = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
# Patch executables to find libX11
#patchelf --set-rpath $(patchelf --print-rpath $out/bin/x64):${libX11}/lib $out/bin/x64
''; '';
meta = { meta = {
description = "Commodore 64, 128 and other emulators"; description = "Commodore 64, 128 and other emulators";
homepage = http://www.viceteam.org; homepage = http://www.viceteam.org;
license = "GPLv2+"; license = "GPLv2+";
maintainers = [ lib.maintainers.sander ]; maintainers = [ stdenv.lib.maintainers.sander ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -9891,7 +9891,9 @@ let
thinkfan = callPackage ../tools/system/thinkfan { }; thinkfan = callPackage ../tools/system/thinkfan { };
vice = callPackage ../misc/emulators/vice { }; vice = callPackage ../misc/emulators/vice {
libX11 = xlibs.libX11;
};
viewnior = callPackage ../applications/graphics/viewnior { }; viewnior = callPackage ../applications/graphics/viewnior { };