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

Merge #80714: icon-lang: fix build

Browse Source
This commit is contained in:
Vladimír Čunát 2020-03-02 16:09:52 +01:00
commit 4d954e528d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/icon-lang/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }: { stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "icon-lang"; pname = "icon-lang";
@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
patches = [
# Patch on git master, likely won't be necessary in future release
(fetchpatch {
url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch";
sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m";
excludes = [
"doc/relnotes.htm"
"src/h/version.h"
];
})
];
configurePhase = configurePhase =
let let
_name = if stdenv.isDarwin then "macintosh" else "linux"; _name = if stdenv.isDarwin then "macintosh" else "linux";

2
pkgs/development/tools/literate-programming/noweb/default.nix
View File

@ -57,7 +57,7 @@ let noweb = stdenv.mkDerivation rec {
# HACK: This is ugly, but functional. # HACK: This is ugly, but functional.
PATH=$out/bin:$PATH make -BC xdoc PATH=$out/bin:$PATH make -BC xdoc
make "''${installFlags[@]}" install-man make "''${installFlags[@]} install-man"
ln -s "$tex" "$out/share/texmf" ln -s "$tex" "$out/share/texmf"
''; '';