aboutsummaryrefslogtreecommitdiff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/default.nix2
-rw-r--r--pkgs/sdcv/default.nix33
2 files changed, 1 insertions, 34 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index b5bbe6b..083e325 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,7 +13,7 @@ final: prev: {
stardict-en-cz = final.callPackage ./stardict/en-cz.nix {};
stardict-de-cz = final.callPackage ./stardict/de-cz.nix {};
stardict-cz = final.callPackage ./stardict/cz.nix {};
- sdcv-unwrapped = final.callPackage ./sdcv {};
+ sdcv-unwrapped = prev.sdcv;
sdcv = final.callPackage ./stardict/wrapper.nix {stardict = final.sdcv-unwrapped;};
lorem-text = final.callPackage ./lorem-text {};
diff --git a/pkgs/sdcv/default.nix b/pkgs/sdcv/default.nix
deleted file mode 100644
index 8817270..0000000
--- a/pkgs/sdcv/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- cmake,
- pkg-config,
- gettext,
- zlib,
- glib,
- pcre,
- readline,
-}:
-stdenv.mkDerivation (attrs: {
- pname = "sdcv";
- version = "0.5.5";
-
- src = fetchFromGitHub {
- owner = "Dushistov";
- repo = attrs.pname;
- rev = "v${attrs.version}";
- hash = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
- };
-
- nativeBuildInputs = [cmake pkg-config gettext];
- buildInputs = [zlib glib pcre readline];
- makeFlags = "sdcv lang";
-
- meta = with lib; {
- description = "Console version of Stardict program";
- homepage = "https://dushistov.github.io/sdcv/";
- license = licenses.gpl2;
- };
-})