diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-09-27 13:38:32 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-09-27 14:28:43 +0200 |
| commit | 843dca38b836801f153d43669d2f95852d6aa637 (patch) | |
| tree | ce8672eee658cc3b8201496c20d3bdd6d63a9dfd /pkgs/tools/misc/fdtools | |
| parent | bf33c0e62e24d95edd7808ff6c19409212da1f96 (diff) | |
fdtools: pin to older skalibs version
fdtools hasn’t caught up with skalibs yet. We also add a revdep test that alerts us in the future if a skalibs bumb breaks fdtools again.
Diffstat (limited to 'pkgs/tools/misc/fdtools')
| -rw-r--r-- | pkgs/tools/misc/fdtools/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix index e9efd66b2f1fd..f55c7f6d3b399 100644 --- a/pkgs/tools/misc/fdtools/default.nix +++ b/pkgs/tools/misc/fdtools/default.nix @@ -2,8 +2,10 @@ let pname = "fdtools"; + # When you update, check whether we can drop the skalibs pin. version = "2020.05.04"; sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla"; + skalibs = skawarePackages.skalibs_2_10; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +18,10 @@ in stdenv.mkDerivation { patches = [ ./new-skalibs.patch ]; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - buildInputs = [ skawarePackages.skalibs ]; + buildInputs = [ + # temporary, until fdtools catches up to skalibs + skalibs + ]; configurePhase = '' cd ${pname}-${version} @@ -27,7 +32,7 @@ in stdenv.mkDerivation { conf-compile/defaults/host_compile.sh \ > conf-compile/host_compile.sh - echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \ + echo "${skalibs.lib}/lib/skalibs/sysdeps" \ > conf-compile/depend_skalibs_sysdeps ''; |