diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2022-01-23 15:37:15 +0100 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2022-02-02 21:41:30 +0100 |
| commit | c1366d7fb90ad2939f949dadb97ba5a9d00541d5 (patch) | |
| tree | 5b047716c43db18c9627b87eda5993590cf20093 /pkgs/applications/graphics/vengi-tools | |
| parent | e175845d6171778ff49b615b5ed7a08dda1387b4 (diff) | |
| download | nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar.gz nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar.bz2 nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar.lz nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar.xz nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.tar.zst nixpkgs-c1366d7fb90ad2939f949dadb97ba5a9d00541d5.zip | |
vengi-tools: unpin cmake
vengi-tools needed >=3.22, and the cmake package is now 3.22.1
Diffstat (limited to 'pkgs/applications/graphics/vengi-tools')
| -rw-r--r-- | pkgs/applications/graphics/vengi-tools/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 96d3c35cb27..09e1672f6d8 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , writeText , cmake @@ -28,18 +27,7 @@ , nixosTests }: -# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently -# related to -# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html -let cmake3_22 = cmake.overrideAttrs (old: { - version = "3.22.0"; - src = fetchurl { - url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz"; - sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4="; - }; -}); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "vengi-tools"; version = "0.0.17"; @@ -69,7 +57,7 @@ in stdenv.mkDerivation rec { '')]; nativeBuildInputs = [ - cmake3_22 + cmake pkg-config ninja python3 |