diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
commit | 647438344bfc1f77791391e2b4f98eef865c63dc (patch) | |
tree | ef580867fc6cc413940e4330d939cf1afda082cb /nixpkgs/pkgs/development/libraries/libqtdbusmock | |
parent | b084c6a0fab7f32c904c5c8e8db8dddcefbe507f (diff) | |
parent | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (diff) | |
download | nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.gz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.bz2 nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.lz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.xz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.zst nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.zip |
Merge commit 'e3474e1d1e53'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libqtdbusmock')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix index d9993947b553..44532a0b9dae 100644 --- a/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqtdbusmock/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchbzr +, fetchFromGitLab , testers , cmake , cmake-extras @@ -17,19 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbusmock"; - version = "unstable-2017-03-16"; + version = "0.9.1"; - src = fetchbzr { - url = "lp:libqtdbusmock"; - rev = "49"; - sha256 = "sha256-q3jL8yGLgcNxXHPh9M9cTVtUvonrBUPNxuPJIvu7Q/s="; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libqtdbusmock"; + rev = finalAttrs.version; + hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo="; }; postPatch = '' - # Look for the new(?) name - substituteInPlace CMakeLists.txt \ - --replace 'NetworkManager' 'libnm' - # Workaround for "error: expected unqualified-id before 'public'" on "**signals" sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' |