mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #178380 from trofi/fix-gmp-parallelism
gpm: pull patch pending upstream inclusion to fix parallel install
This commit is contained in:
commit
f00d895202
1 changed files with 10 additions and 0 deletions
|
@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/kaction/gpm/commit/217b4fe4c9b62298a4e9a54c1f07e3b52b013a09.patch";
|
url = "https://github.com/kaction/gpm/commit/217b4fe4c9b62298a4e9a54c1f07e3b52b013a09.patch";
|
||||||
sha256 = "1f74h12iph4z1dldbxk9imcq11805c3ai2xhbsqvx8jpjrcfp19q";
|
sha256 = "1f74h12iph4z1dldbxk9imcq11805c3ai2xhbsqvx8jpjrcfp19q";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Pull fix pending upstream inclusion to fix parallel installation:
|
||||||
|
# https://github.com/telmich/gpm/pull/43
|
||||||
|
(fetchpatch {
|
||||||
|
name = "parallel-install.patch";
|
||||||
|
url = "https://github.com/telmich/gpm/commit/a88fb82a7afe96e872bb31c554e9ad5888f5a451.patch";
|
||||||
|
sha256 = "0g1jhz9bjw7vqjv922xkhs8xkjxdqh11nj38jj3c8nv5lcil76nx";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
@ -38,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||||
(if ncurses == null then "--without-curses" else "--with-curses")
|
(if ncurses == null then "--without-curses" else "--with-curses")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
# Provide libgpm.so for compatability
|
# Provide libgpm.so for compatability
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so
|
ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so
|
||||||
|
|
Loading…
Reference in a new issue