diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-05-02 18:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 18:23:52 +0200 |
| commit | 10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3 (patch) | |
| tree | dc2b5c8fb109e9d325cdc38e392052d55e1b6aef | |
| parent | e3dfd6a8ad375267a8bda28110d9ab4d9946ba7f (diff) | |
| parent | 4e5dc335e5c368db5a9991f9060b9b261367e2c8 (diff) | |
| download | nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar.gz nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar.bz2 nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar.lz nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar.xz nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.tar.zst nixlib-10fefceb5781f19d21ce0db8a3ec6e96a93f9ca3.zip | |
Merge pull request #60393 from Infinisil/leksah
leksah: Point to upstream repository for using it
| -rw-r--r-- | pkgs/development/tools/haskell/leksah/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix deleted file mode 100644 index ec2fb334a3b3..000000000000 --- a/pkgs/development/tools/haskell/leksah/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, ghcWithPackages, gtk3, makeWrapper }: - -let -leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]); -in stdenv.mkDerivation { - name = "leksah-${leksahEnv.version}"; - - buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \ - --prefix PATH : "${leksahEnv}/bin" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - broken = true; # 2018-09-13, no successful hydra build since 2017-08-19 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea43db314a95..9a5c403c428d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12749,9 +12749,8 @@ in lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; - leksah = callPackage ../development/tools/haskell/leksah { - inherit (haskellPackages) ghcWithPackages; - }; + leksah = throw ("To use leksah, refer to the instructions in " + + "https://github.com/leksah/leksah."); libgme = callPackage ../development/libraries/audio/libgme { }; |