diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-04-19 14:57:25 +0200 |
commit | 0ca211d4ec600fa7b3cc701e4997cd1e8d38ebdc (patch) | |
tree | 4f9b09ca5d55e44710f020bcf6621daa4fd6b73a /nixpkgs/pkgs/development/compilers/fpc/default.nix | |
parent | 1c2ef52230ed2c8b2529c47ce6a857bdde46c7c7 (diff) | |
parent | b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb (diff) |
Merge commit 'b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/fpc/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/fpc/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/fpc/default.nix b/nixpkgs/pkgs/development/compilers/fpc/default.nix index 7bddafc6ff5..42804677dc0 100644 --- a/nixpkgs/pkgs/development/compilers/fpc/default.nix +++ b/nixpkgs/pkgs/development/compilers/fpc/default.nix @@ -3,20 +3,22 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.4"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm"; + sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn"; }; buildInputs = [ startFPC gawk ]; + glibc = stdenv.cc.libc.out; preConfigure = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas + sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - homepage = https://www.freepascal.org; + homepage = "https://www.freepascal.org"; maintainers = [ maintainers.raskin ]; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; |