diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-08 13:17:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 13:17:37 +0100 |
| commit | b214874bda69226cc8896050eb856630659991c9 (patch) | |
| tree | 7903e873fcd63225b93eb2323b4638deb9377f17 /pkgs/applications | |
| parent | 28cf1a7a656d1f8a74c33c5f8c3be43171357b6e (diff) | |
| parent | 209d455583c33756ea5c56148985b8e038c6b0af (diff) | |
| download | nixlib-b214874bda69226cc8896050eb856630659991c9.tar nixlib-b214874bda69226cc8896050eb856630659991c9.tar.gz nixlib-b214874bda69226cc8896050eb856630659991c9.tar.bz2 nixlib-b214874bda69226cc8896050eb856630659991c9.tar.lz nixlib-b214874bda69226cc8896050eb856630659991c9.tar.xz nixlib-b214874bda69226cc8896050eb856630659991c9.tar.zst nixlib-b214874bda69226cc8896050eb856630659991c9.zip | |
Merge pull request #38541 from sifmelcara/fix/pcmanx/libtoolize
pcmanx-gtk2: fix build
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/pcmanx-gtk2/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 060d4899f4c7..7448b8e6648b 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanx-gtk2-1.3"; - src = fetchurl { - url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; - sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; +stdenv.mkDerivation rec { + name = "pcmanx-gtk2-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "pcman-bbs"; + repo = "pcmanx"; + rev = version; + sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -12,6 +16,8 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh + # libtoolize generates configure script which uses older version of automake, we need to autoreconf it + cd libltdl; autoreconf; cd .. ''; meta = with stdenv.lib; { |