diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-07-23 00:16:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-23 00:16:23 +0200 |
commit | c4c378b6138ac224f2de13ecf172a760104dae3e (patch) | |
tree | ae0a3c9287cc8d9b13f6c349a2ed6dbe4cf282ec /pkgs/applications/window-managers | |
parent | 32a31353c45538ef84b19735b7971742d9143611 (diff) | |
parent | a6df5b9f1d4a2ef62c368b080caf815497d86a17 (diff) |
Merge pull request #17156 from KoviRobi/wmii-hg-update
wmii-hg: refactor to fetchurl as fetchhg broke
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/wmii-hg/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 33dcfe8adf455..5a1f583b6535e 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which +{ stdenv, fetchurl, unzip, pkgconfig, libixp_hg, txt2tags, dash, python, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -6,15 +6,14 @@ stdenv.mkDerivation rec { version = "hg-2012-12-09"; name = "wmii-${version}"; - src = fetchhg { - url = https://code.google.com/p/wmii/; - sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51"; - inherit rev; + src = fetchurl { + url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip; + sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; }; # for dlopen-ing patchPhase = '' - substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" + substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" ''; @@ -30,14 +29,14 @@ stdenv.mkDerivation rec { EOF ''; - buildInputs = [ pkgconfig libixp_hg txt2tags dash python which + buildInputs = [ unzip pkgconfig libixp_hg txt2tags dash python which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help makeFlags = "WMII_HGVERSION=hg${rev}"; meta = { - homepage = "https://code.google.com/p/wmii/"; + homepage = "https://code.google.com/archive/p/wmii/"; description = "A small window manager controlled by a 9P filesystem"; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; |