mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
libX11 is not in vice's rpath. this fixes it
This commit is contained in:
parent
6eb240ed24
commit
1642e3a6d7
@ -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
|
||||
}:
|
||||
|
||||
@ -28,15 +28,20 @@ stdenv.mkDerivation rec {
|
||||
autoreconf -f -i
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $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 = {
|
||||
description = "Commodore 64, 128 and other emulators";
|
||||
homepage = http://www.viceteam.org;
|
||||
license = "GPLv2+";
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
maintainers = [ stdenv.lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
@ -9891,7 +9891,9 @@ let
|
||||
|
||||
thinkfan = callPackage ../tools/system/thinkfan { };
|
||||
|
||||
vice = callPackage ../misc/emulators/vice { };
|
||||
vice = callPackage ../misc/emulators/vice {
|
||||
libX11 = xlibs.libX11;
|
||||
};
|
||||
|
||||
viewnior = callPackage ../applications/graphics/viewnior { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user