Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb368b77fd68
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f98643ff4d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 19, 2020

  1. lib3mf: 1.8.1 → 2.0.0

    @SuperSandro2000
    SuperSandro2000 committed Oct 19, 2020
    Copy the full SHA
    5584227 View commit details

Commits on Nov 26, 2020

  1. Merge pull request #101105 from SuperSandro2000/lib3mf-2.0.0 

    lib3mf: 1.8.1 → 2.0.0
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0f98643 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/libraries/lib3mf/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/libraries/lib3mf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,22 @@

stdenv.mkDerivation rec {
pname = "lib3mf";
version = "1.8.1";
version = "2.0.0";

src = fetchFromGitHub {
owner = "3MFConsortium";
repo = pname;
rev = "v${version}";
sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd";
sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19";
};

nativeBuildInputs = [ cmake ninja ];

buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ];

postPatch = ''
rmdir UnitTests/googletest
ln -s ${gtest.src} UnitTests/googletest
rmdir Tests/googletest
ln -s ${gtest.src} Tests/googletest
# fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in