diff options
author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-18 07:30:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2022-09-18 07:31:10 +0200 |
commit | f8dcf25486a1ed8d30aa98e17859dc45c65e488c (patch) | |
tree | 176e29bc16b92dac4b76f8ddc4583195cd44133d /pkgs/development/libraries/cglm | |
parent | 5875423007b766548e1b7655338014e4d789b029 (diff) | |
parent | 9c2a7cc09d66fb7ffbc9609abe4d6d1521834152 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/cglm')
-rw-r--r-- | pkgs/development/libraries/cglm/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 610a66e6d72f8..5929c9dcbd3b1 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -17,17 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # FIXME: these parts probably need some cleanup. - # https://github.com/recp/cglm/issues/249 postPatch = '' substituteInPlace CMakeLists.txt \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; meta = with lib; { homepage = "https://github.com/recp/cglm"; |